diff --git a/pom.xml b/pom.xml
index 332f8b16c..416c5675d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,7 +217,7 @@ SOFTWARE.
           <plugin>
             <groupId>com.qulice</groupId>
             <artifactId>qulice-maven-plugin</artifactId>
-            <version>0.22.0</version>
+            <version>0.22.2</version>
             <configuration>
               <excludes combine.children="append">
                 <exclude>checkstyle:/src/site/resources/.*</exclude>
diff --git a/src/main/java/org/cactoos/bytes/BytesOf.java b/src/main/java/org/cactoos/bytes/BytesOf.java
index b7d97e58d..2f47a42e9 100644
--- a/src/main/java/org/cactoos/bytes/BytesOf.java
+++ b/src/main/java/org/cactoos/bytes/BytesOf.java
@@ -49,6 +49,7 @@
  *
  * @since 0.12
  */
+@SuppressWarnings("PMD.OnlyOneConstructorShouldDoInitialization")
 public final class BytesOf implements Bytes {
 
     /**
@@ -263,6 +264,7 @@ public BytesOf(final Throwable error, final Charset charset) {
      * @param error The exception to serialize
      * @param charset Charset
      */
+    @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
     public BytesOf(final Throwable error, final CharSequence charset) {
         this(
             () -> {
@@ -304,6 +306,7 @@ public BytesOf(final StackTraceElement[] strace, final Charset charset) {
      * @param charset Charset
      * @since 0.29
      */
+    @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
     public BytesOf(final StackTraceElement[] strace,
         final CharSequence charset) {
         this(
diff --git a/src/main/java/org/cactoos/collection/CollectionEnvelope.java b/src/main/java/org/cactoos/collection/CollectionEnvelope.java
index 14569bd70..88417c075 100644
--- a/src/main/java/org/cactoos/collection/CollectionEnvelope.java
+++ b/src/main/java/org/cactoos/collection/CollectionEnvelope.java
@@ -33,6 +33,7 @@
  * @param <X> Element type
  * @since 0.23
  */
+@SuppressWarnings("PMD.TooManyMethods")
 public abstract class CollectionEnvelope<X>
     extends IterableEnvelope<X> implements Collection<X> {
 
diff --git a/src/main/java/org/cactoos/io/InputOf.java b/src/main/java/org/cactoos/io/InputOf.java
index afd3189d9..8e539ea57 100644
--- a/src/main/java/org/cactoos/io/InputOf.java
+++ b/src/main/java/org/cactoos/io/InputOf.java
@@ -59,6 +59,7 @@ public final class InputOf implements Input {
      *
      * @param file The file
      */
+    @SuppressWarnings("PMD.AvoidFileStream")
     public InputOf(final File file) {
         this(
             () -> new FileInputStream(
@@ -72,6 +73,7 @@ public InputOf(final File file) {
      *
      * @param path The path
      */
+    @SuppressWarnings("PMD.AvoidFileStream")
     public InputOf(final Path path) {
         this(() -> new FileInputStream(path.toFile()));
     }
diff --git a/src/main/java/org/cactoos/io/OutputTo.java b/src/main/java/org/cactoos/io/OutputTo.java
index 8dd8c92d5..9ba5ee8f3 100644
--- a/src/main/java/org/cactoos/io/OutputTo.java
+++ b/src/main/java/org/cactoos/io/OutputTo.java
@@ -60,6 +60,7 @@ public OutputTo(final File file) {
      * @param mkdirs Should we do mkdirs beforehand?
      * @since 0.15
      */
+    @SuppressWarnings("PMD.AvoidFileStream")
     public OutputTo(final File file, final boolean mkdirs) {
         this(
             () -> {
@@ -85,6 +86,7 @@ public OutputTo(final Path path) {
      * @param mkdirs Should we do mkdirs beforehand?
      * @since 0.15
      */
+    @SuppressWarnings("PMD.AvoidFileStream")
     public OutputTo(final Path path, final boolean mkdirs) {
         this(
             () -> {
diff --git a/src/main/java/org/cactoos/io/ResourceOf.java b/src/main/java/org/cactoos/io/ResourceOf.java
index 4a2828cac..9d7d6b2be 100644
--- a/src/main/java/org/cactoos/io/ResourceOf.java
+++ b/src/main/java/org/cactoos/io/ResourceOf.java
@@ -75,6 +75,7 @@ public ResourceOf(final CharSequence res) {
      * @param cls Resource class loader
      * @since 0.49
      */
+    @SuppressWarnings("PMD.UseProperClassLoader")
     public ResourceOf(final CharSequence res, final Class<?> cls) {
         this(res, cls.getClassLoader());
     }
@@ -95,6 +96,7 @@ public ResourceOf(final CharSequence res, final ClassLoader ldr) {
      * @param cls Resource class loader
      * @since 0.49
      */
+    @SuppressWarnings("PMD.UseProperClassLoader")
     public ResourceOf(final CharSequence res,
         final Func<CharSequence, Input> fbk, final Class<?> cls) {
         this(res, fbk, cls.getClassLoader());
@@ -210,6 +212,7 @@ public ResourceOf(final Text res,
     }
 
     @Override
+    @SuppressWarnings("PMD.CloseResource")
     public InputStream stream() throws Exception {
         InputStream input = this.loader.getResourceAsStream(
             this.path.asString()
diff --git a/src/main/java/org/cactoos/io/TailOf.java b/src/main/java/org/cactoos/io/TailOf.java
index 07b911729..3b0c57516 100644
--- a/src/main/java/org/cactoos/io/TailOf.java
+++ b/src/main/java/org/cactoos/io/TailOf.java
@@ -59,7 +59,7 @@ public final class TailOf implements Input {
      * @param bytes Number of last bytes to show from input
      */
     public TailOf(final Input inpt, final int bytes) {
-        this(inpt, bytes, 16384);
+        this(inpt, bytes, 16_384);
     }
 
     /**
@@ -87,12 +87,13 @@ public InputStream stream() throws Exception {
         final byte[] buffer = new byte[this.max];
         final byte[] response = new byte[this.count];
         int num = 0;
-        final InputStream strm = this.input.stream();
-        for (int read = strm.read(buffer); read > 0; read = strm.read(buffer)) {
-            if (read < this.max && read < this.count) {
-                num = this.copyPartial(buffer, response, num, read);
-            } else {
-                num = this.copy(buffer, response, read);
+        try (InputStream strm = this.input.stream()) {
+            for (int read = strm.read(buffer); read > 0; read = strm.read(buffer)) {
+                if (read < this.max && read < this.count) {
+                    num = this.copyPartial(buffer, response, num, read);
+                } else {
+                    num = this.copy(buffer, response, read);
+                }
             }
         }
         return new ByteArrayInputStream(response, 0, num);
diff --git a/src/main/java/org/cactoos/io/TempFolder.java b/src/main/java/org/cactoos/io/TempFolder.java
index 5e8a90dc0..e0365f233 100644
--- a/src/main/java/org/cactoos/io/TempFolder.java
+++ b/src/main/java/org/cactoos/io/TempFolder.java
@@ -72,9 +72,9 @@ public TempFolder() {
                 new Randomized(
                     new org.cactoos.iterable.Joined<>(
                         new IterableOf<>(
-                            new RangeOf<>('0', '9', ch -> ++ch),
-                            new RangeOf<>('A', 'Z', ch -> ++ch),
-                            new RangeOf<>('a', 'z', ch -> ++ch)
+                            new RangeOf<>('0', '9', ch -> (char) (ch + 1)),
+                            new RangeOf<>('A', 'Z', ch -> (char) (ch + 1)),
+                            new RangeOf<>('a', 'z', ch -> (char) (ch + 1))
                         )
                     ),
                     () -> 5
diff --git a/src/main/java/org/cactoos/io/Zip.java b/src/main/java/org/cactoos/io/Zip.java
index dcdb8fd1a..fbb130c2e 100644
--- a/src/main/java/org/cactoos/io/Zip.java
+++ b/src/main/java/org/cactoos/io/Zip.java
@@ -67,6 +67,7 @@ public Zip(final Iterable<? extends Path> origin) {
     }
 
     @Override
+    @SuppressWarnings("PMD.AvoidFileStream")
     public InputStream stream() throws Exception {
         final ByteArrayOutputStream out = new ByteArrayOutputStream();
         try (ZipOutputStream zip = new ZipOutputStream(out)) {
diff --git a/src/main/java/org/cactoos/iterable/IterableOf.java b/src/main/java/org/cactoos/iterable/IterableOf.java
index 06bf8b62f..3ff8e3cbd 100644
--- a/src/main/java/org/cactoos/iterable/IterableOf.java
+++ b/src/main/java/org/cactoos/iterable/IterableOf.java
@@ -85,7 +85,7 @@ public Iterator<X> iterator() {
 
     @Override
     @SuppressFBWarnings("EQ_UNUSUAL")
-    @SuppressWarnings (value = "unchecked")
+    @SuppressWarnings("unchecked")
     public boolean equals(final Object other) {
         return new Unchecked<>(
             new Or(
diff --git a/src/main/java/org/cactoos/iterable/Partitioned.java b/src/main/java/org/cactoos/iterable/Partitioned.java
index cb361dc82..1abd4cd12 100644
--- a/src/main/java/org/cactoos/iterable/Partitioned.java
+++ b/src/main/java/org/cactoos/iterable/Partitioned.java
@@ -39,7 +39,7 @@ public final class Partitioned<T> extends IterableEnvelope<List<T>> {
      * @param items The source items.
      */
     @SafeVarargs
-    public Partitioned(final int size, final T...items) {
+    public Partitioned(final int size, final T... items) {
         this(size, new IterableOf<>(items));
     }
 
diff --git a/src/main/java/org/cactoos/iterable/Synced.java b/src/main/java/org/cactoos/iterable/Synced.java
index 62eebfb47..d4521af8a 100644
--- a/src/main/java/org/cactoos/iterable/Synced.java
+++ b/src/main/java/org/cactoos/iterable/Synced.java
@@ -24,7 +24,6 @@
 package org.cactoos.iterable;
 
 import java.util.Iterator;
-import org.cactoos.iterator.Mapped;
 
 /**
  * Synchronized iterable.
diff --git a/src/main/java/org/cactoos/iterator/IteratorOf.java b/src/main/java/org/cactoos/iterator/IteratorOf.java
index 7294da34c..370799e78 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOf.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOf.java
@@ -52,6 +52,7 @@ public final class IteratorOf<X> implements Iterator<X> {
      * @param items Items to iterate
      */
     @SafeVarargs
+    @SuppressWarnings("PMD.ArrayIsStoredDirectly")
     public IteratorOf(final X... items) {
         this.list = items;
         this.position = new AtomicInteger(0);
diff --git a/src/main/java/org/cactoos/iterator/IteratorOfBooleans.java b/src/main/java/org/cactoos/iterator/IteratorOfBooleans.java
index b2047b29e..6791ec5b3 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOfBooleans.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOfBooleans.java
@@ -49,6 +49,7 @@ public final class IteratorOfBooleans implements Iterator<Boolean> {
      * Ctor.
      * @param items Items to iterate
      */
+    @SuppressWarnings("PMD.ArrayIsStoredDirectly")
     public IteratorOfBooleans(final boolean... items) {
         this.list = items;
         this.position = new AtomicInteger(0);
diff --git a/src/main/java/org/cactoos/iterator/IteratorOfBytes.java b/src/main/java/org/cactoos/iterator/IteratorOfBytes.java
index 5e3e72dc8..157bc52a5 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOfBytes.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOfBytes.java
@@ -78,6 +78,7 @@ public IteratorOfBytes(final Bytes bytes) {
      * Ctor.
      * @param itms Items to iterate
      */
+    @SuppressWarnings("PMD.ArrayIsStoredDirectly")
     public IteratorOfBytes(final byte... itms) {
         this.items = itms;
         this.position = new AtomicInteger(0);
diff --git a/src/main/java/org/cactoos/iterator/IteratorOfChars.java b/src/main/java/org/cactoos/iterator/IteratorOfChars.java
index 825bb14e1..a532a1e6f 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOfChars.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOfChars.java
@@ -66,6 +66,7 @@ public IteratorOfChars(final Text txt) {
      * Ctor.
      * @param items Items to iterate
      */
+    @SuppressWarnings("PMD.ArrayIsStoredDirectly")
     public IteratorOfChars(final char... items) {
         this.list = items;
         this.position = new AtomicInteger(0);
diff --git a/src/main/java/org/cactoos/iterator/IteratorOfDoubles.java b/src/main/java/org/cactoos/iterator/IteratorOfDoubles.java
index cb2afb93a..83ff2be0f 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOfDoubles.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOfDoubles.java
@@ -50,6 +50,7 @@ public final class IteratorOfDoubles implements Iterator<Double> {
      * Ctor.
      * @param itms Items to iterate
      */
+    @SuppressWarnings("PMD.ArrayIsStoredDirectly")
     public IteratorOfDoubles(final double... itms) {
         this.items = itms;
         this.position = new AtomicInteger(0);
diff --git a/src/main/java/org/cactoos/iterator/IteratorOfFloats.java b/src/main/java/org/cactoos/iterator/IteratorOfFloats.java
index bc29e7867..a8e501bc6 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOfFloats.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOfFloats.java
@@ -49,6 +49,7 @@ public final class IteratorOfFloats implements Iterator<Float> {
      * Ctor.
      * @param itms Items to iterate
      */
+    @SuppressWarnings("PMD.ArrayIsStoredDirectly")
     public IteratorOfFloats(final float... itms) {
         this.items = itms;
         this.position = new AtomicInteger(0);
diff --git a/src/main/java/org/cactoos/iterator/IteratorOfInts.java b/src/main/java/org/cactoos/iterator/IteratorOfInts.java
index 12820796e..65436568e 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOfInts.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOfInts.java
@@ -49,6 +49,7 @@ public final class IteratorOfInts implements Iterator<Integer> {
      * Ctor.
      * @param itms Items to iterate
      */
+    @SuppressWarnings("PMD.ArrayIsStoredDirectly")
     public IteratorOfInts(final int... itms) {
         this.items = itms;
         this.position = new AtomicInteger(0);
diff --git a/src/main/java/org/cactoos/iterator/IteratorOfLongs.java b/src/main/java/org/cactoos/iterator/IteratorOfLongs.java
index 767a790e3..f871129de 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOfLongs.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOfLongs.java
@@ -50,6 +50,7 @@ public final class IteratorOfLongs implements Iterator<Long> {
      * Ctor.
      * @param itms Items to iterate
      */
+    @SuppressWarnings("PMD.ArrayIsStoredDirectly")
     public IteratorOfLongs(final long... itms) {
         this.items = itms;
         this.position = new AtomicInteger(0);
diff --git a/src/main/java/org/cactoos/iterator/IteratorOfShorts.java b/src/main/java/org/cactoos/iterator/IteratorOfShorts.java
index ccdd6df40..adf8e2405 100644
--- a/src/main/java/org/cactoos/iterator/IteratorOfShorts.java
+++ b/src/main/java/org/cactoos/iterator/IteratorOfShorts.java
@@ -51,6 +51,7 @@ public final class IteratorOfShorts implements Iterator<Short> {
      * Ctor.
      * @param itms Items to iterate
      */
+    @SuppressWarnings("PMD.ArrayIsStoredDirectly")
     public IteratorOfShorts(final short... itms) {
         this.items = itms;
         this.position = new AtomicInteger(0);
diff --git a/src/main/java/org/cactoos/list/ListOf.java b/src/main/java/org/cactoos/list/ListOf.java
index 8d9ed9611..8d7c19066 100644
--- a/src/main/java/org/cactoos/list/ListOf.java
+++ b/src/main/java/org/cactoos/list/ListOf.java
@@ -60,6 +60,7 @@ public ListOf(final Iterator<? extends T> src) {
      * Ctor.
      * @param src An {@link Iterable}
      */
+    @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
     public ListOf(final Iterable<? extends T> src) {
         super(new LinkedList<>());
         src.forEach(super::add);
diff --git a/src/main/java/org/cactoos/proc/RunnableOf.java b/src/main/java/org/cactoos/proc/RunnableOf.java
index 7b57b395f..e6f50cb90 100644
--- a/src/main/java/org/cactoos/proc/RunnableOf.java
+++ b/src/main/java/org/cactoos/proc/RunnableOf.java
@@ -68,6 +68,7 @@ public RunnableOf(final Scalar<?> scalar) {
      * @param callable The callable
      * @since 0.53
      */
+    @SuppressWarnings("PMD.AvoidCatchingGenericException")
     public RunnableOf(final Callable<?> callable) {
         this(
             () -> {
diff --git a/src/main/java/org/cactoos/scalar/Checked.java b/src/main/java/org/cactoos/scalar/Checked.java
index e5118bd9f..0947418a4 100644
--- a/src/main/java/org/cactoos/scalar/Checked.java
+++ b/src/main/java/org/cactoos/scalar/Checked.java
@@ -63,14 +63,13 @@ public Checked(final Scalar<? extends T> scalar,
     }
 
     @Override
-    @SuppressWarnings
-        (
-            {
-                "PMD.AvoidCatchingGenericException",
-                "PMD.AvoidRethrowingException",
-                "PMD.PreserveStackTrace"
-            }
-        )
+    @SuppressWarnings(
+        {
+            "PMD.AvoidCatchingGenericException",
+            "PMD.AvoidRethrowingException",
+            "PMD.PreserveStackTrace"
+        }
+    )
     public T value() throws E {
         try {
             return this.origin.value();
diff --git a/src/main/java/org/cactoos/scalar/LengthOf.java b/src/main/java/org/cactoos/scalar/LengthOf.java
index 44cd897f3..20a218e0d 100644
--- a/src/main/java/org/cactoos/scalar/LengthOf.java
+++ b/src/main/java/org/cactoos/scalar/LengthOf.java
@@ -79,6 +79,7 @@ public LengthOf(final Input input) {
      * @param input The input
      * @param max Buffer size
      */
+    @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
     public LengthOf(final Input input, final int max) {
         this(() -> {
             if (max == 0) {
diff --git a/src/main/java/org/cactoos/scalar/PropertiesOf.java b/src/main/java/org/cactoos/scalar/PropertiesOf.java
index 8ded2fa6d..34d63d784 100644
--- a/src/main/java/org/cactoos/scalar/PropertiesOf.java
+++ b/src/main/java/org/cactoos/scalar/PropertiesOf.java
@@ -32,7 +32,6 @@
 import org.cactoos.Text;
 import org.cactoos.io.InputOf;
 import org.cactoos.iterable.IterableOf;
-import org.cactoos.iterable.Mapped;
 import org.cactoos.map.MapEntry;
 import org.cactoos.map.MapOf;
 import org.cactoos.text.TextOf;
@@ -44,6 +43,7 @@
  *
  * @since 0.12
  */
+@SuppressWarnings("PMD.OnlyOneConstructorShouldDoInitialization")
 public final class PropertiesOf implements Scalar<Properties> {
 
     /**
@@ -71,6 +71,7 @@ public PropertiesOf(final Text text) {
      * Ctor.
      * @param input Input
      */
+    @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
     public PropertiesOf(final Input input) {
         this(
             () -> {
diff --git a/src/main/java/org/cactoos/set/SetEnvelope.java b/src/main/java/org/cactoos/set/SetEnvelope.java
index a5533fa3e..abc038fee 100644
--- a/src/main/java/org/cactoos/set/SetEnvelope.java
+++ b/src/main/java/org/cactoos/set/SetEnvelope.java
@@ -31,8 +31,8 @@
  * <p>There is no thread-safety guarantee.</p>
  *
  * @param <T> Element type
- * @checkstyle AbstractClassNameCheck (500 lines)
  * @since 0.49.2
+ * @checkstyle AbstractClassNameCheck (500 lines)
  */
 @SuppressWarnings(
     {
diff --git a/src/main/java/org/cactoos/set/SetOf.java b/src/main/java/org/cactoos/set/SetOf.java
index 960107b99..f70aa2f3e 100644
--- a/src/main/java/org/cactoos/set/SetOf.java
+++ b/src/main/java/org/cactoos/set/SetOf.java
@@ -51,6 +51,7 @@ public SetOf(final T... array) {
      * Ctor.
      * @param src An {@link Iterable}
      */
+    @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
     public SetOf(final Iterable<? extends T> src) {
         super(new HashSet<>());
         src.forEach(super::add);
diff --git a/src/main/java/org/cactoos/set/SortedSetEnvelope.java b/src/main/java/org/cactoos/set/SortedSetEnvelope.java
index 1efb08bd3..ea53ad008 100644
--- a/src/main/java/org/cactoos/set/SortedSetEnvelope.java
+++ b/src/main/java/org/cactoos/set/SortedSetEnvelope.java
@@ -31,8 +31,8 @@
  * <p>There is no thread-safety guarantee.</p>
  *
  * @param <T> Element type
- * @checkstyle AbstractClassNameCheck (500 lines)
  * @since 0.45
+ * @checkstyle AbstractClassNameCheck (500 lines)
  */
 @SuppressWarnings(
     {
diff --git a/src/main/java/org/cactoos/text/FormattedText.java b/src/main/java/org/cactoos/text/FormattedText.java
index 46d408512..e7e96e6da 100644
--- a/src/main/java/org/cactoos/text/FormattedText.java
+++ b/src/main/java/org/cactoos/text/FormattedText.java
@@ -130,6 +130,7 @@ public FormattedText(
      * @param locale Format locale
      * @param args Arguments
      */
+    @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
     public FormattedText(
         final Text ptn,
         final Locale locale,
diff --git a/src/main/java/org/cactoos/text/HexOf.java b/src/main/java/org/cactoos/text/HexOf.java
index c4e2fcd56..b612687f5 100644
--- a/src/main/java/org/cactoos/text/HexOf.java
+++ b/src/main/java/org/cactoos/text/HexOf.java
@@ -53,8 +53,8 @@ public HexOf(final Bytes bytes) {
                     final byte[] bts = bytes.asBytes();
                     final char[] hex = new char[bts.length * 2];
                     int chr = -1;
-                    for (int idx = 0; idx < bts.length; ++idx) {
-                        final int value = 0xff & bts[idx];
+                    for (final byte byt: bts) {
+                        final int value = 0xff & byt;
                         hex[++chr] = HexOf.HEX_CHARS[value >>> 4];
                         hex[++chr] = HexOf.HEX_CHARS[value & 0x0f];
                     }
diff --git a/src/main/java/org/cactoos/text/Randomized.java b/src/main/java/org/cactoos/text/Randomized.java
index e932ce807..024ad4b58 100644
--- a/src/main/java/org/cactoos/text/Randomized.java
+++ b/src/main/java/org/cactoos/text/Randomized.java
@@ -70,7 +70,7 @@ public Randomized(final Integer len) {
     public Randomized(final Scalar<Integer> len) {
         this(
             new RangeOf<>(
-                '!', '~', ch -> ++ch
+                '!', '~', ch -> (char) (ch + 1)
             ),
             len
         );
diff --git a/src/main/java/org/cactoos/text/Rotated.java b/src/main/java/org/cactoos/text/Rotated.java
index 3de4e4e76..c4437c085 100644
--- a/src/main/java/org/cactoos/text/Rotated.java
+++ b/src/main/java/org/cactoos/text/Rotated.java
@@ -47,6 +47,7 @@ public Rotated(final Text text, final int shift) {
                             offset = origin.length() + offset;
                         }
                         final StringBuilder builder = new StringBuilder(length);
+                        // @checkstyle ParameterAssignmentCheck (6 lines)
                         origin = builder.append(
                             origin.substring(offset)
                         ).append(
diff --git a/src/test/java/org/cactoos/func/SolidBiFuncTest.java b/src/test/java/org/cactoos/func/SolidBiFuncTest.java
index f883f1f09..67b03be2b 100644
--- a/src/test/java/org/cactoos/func/SolidBiFuncTest.java
+++ b/src/test/java/org/cactoos/func/SolidBiFuncTest.java
@@ -43,7 +43,7 @@ final class SolidBiFuncTest {
     @Test
     void testThatFuncIsSynchronized() {
         final int threads = 100;
-        final int[] shared = new int[]{0};
+        final int[] shared = {0};
         final BiFunc<Integer, Integer, Boolean> testable =
             new SolidBiFunc<>(
                 (first, second) -> {
diff --git a/src/test/java/org/cactoos/io/CloseShieldInputStreamTest.java b/src/test/java/org/cactoos/io/CloseShieldInputStreamTest.java
index 7cc934f85..e15284d61 100644
--- a/src/test/java/org/cactoos/io/CloseShieldInputStreamTest.java
+++ b/src/test/java/org/cactoos/io/CloseShieldInputStreamTest.java
@@ -44,7 +44,7 @@ final class CloseShieldInputStreamTest {
     void preventsOriginalStreamToBeClosed() throws Exception {
         try (FakeInputStream origin = new FakeInputStream()) {
             // @checkstyle EmptyBlockCheck (2 lines)
-            try (InputStream stream = new CloseShieldInputStream(origin)) {
+            try (InputStream ignored = new CloseShieldInputStream(origin)) {
             }
             new Assertion<>(
                 "Must not close origin stream",
diff --git a/src/test/java/org/cactoos/io/CloseShieldInputTest.java b/src/test/java/org/cactoos/io/CloseShieldInputTest.java
index b94477104..d9c9fa7cd 100644
--- a/src/test/java/org/cactoos/io/CloseShieldInputTest.java
+++ b/src/test/java/org/cactoos/io/CloseShieldInputTest.java
@@ -43,7 +43,7 @@ void preventsOriginalStreamToBeClosed() throws Exception {
         try (FakeInputStream origin = new FakeInputStream()) {
             // @checkstyle EmptyBlockCheck (5 lines)
             try (
-                InputStream stream =
+                InputStream ignored =
                     new CloseShieldInput(new InputOf(origin)).stream()
             ) {
             }
diff --git a/src/test/java/org/cactoos/io/CloseShieldOutputStreamTest.java b/src/test/java/org/cactoos/io/CloseShieldOutputStreamTest.java
index a069a78be..7c2c1a109 100644
--- a/src/test/java/org/cactoos/io/CloseShieldOutputStreamTest.java
+++ b/src/test/java/org/cactoos/io/CloseShieldOutputStreamTest.java
@@ -69,7 +69,7 @@ void writesContentToFile(@TempDir final Path tempdir) throws IOException {
     void preventsOriginalStreamToBeClosed() throws Exception {
         try (FakeOutputStream origin = new FakeOutputStream()) {
             // @checkstyle EmptyBlockCheck (2 lines)
-            try (OutputStream stream = new CloseShieldOutputStream(origin)) {
+            try (OutputStream ignored = new CloseShieldOutputStream(origin)) {
             }
             new Assertion<>(
                 "Must not close origin stream",
diff --git a/src/test/java/org/cactoos/io/CloseShieldOutputTest.java b/src/test/java/org/cactoos/io/CloseShieldOutputTest.java
index 789acd3f6..003a5e9a4 100644
--- a/src/test/java/org/cactoos/io/CloseShieldOutputTest.java
+++ b/src/test/java/org/cactoos/io/CloseShieldOutputTest.java
@@ -41,7 +41,7 @@ void preventsOriginalStreamToBeClosed() throws Exception {
         try (FakeOutputStream origin = new FakeOutputStream()) {
             // @checkstyle EmptyBlockCheck (5 lines)
             try (
-                OutputStream stream = new CloseShieldOutput(() -> origin).stream()
+                OutputStream ignored = new CloseShieldOutput(() -> origin).stream()
             ) {
             }
             new Assertion<>(
diff --git a/src/test/java/org/cactoos/io/GzipOutputTest.java b/src/test/java/org/cactoos/io/GzipOutputTest.java
index 3bcd6803f..95955ae3b 100644
--- a/src/test/java/org/cactoos/io/GzipOutputTest.java
+++ b/src/test/java/org/cactoos/io/GzipOutputTest.java
@@ -42,8 +42,9 @@
 
 /**
  * Test case for {@link GzipOutput}.
- * @checkstyle JavadocMethodCheck (500 lines)
+ *
  * @since 0.29
+ * @checkstyle JavadocMethodCheck (500 lines)
  */
 @SuppressWarnings({"PMD.AvoidDuplicateLiterals",
     "PMD.JUnitTestsShouldIncludeAssert"})
@@ -82,6 +83,7 @@ void writeToGzipOutput() throws Exception {
     }
 
     @Test
+    @SuppressWarnings("PMD.CloseResource")
     void writeToClosedGzipOutput(@TempDir final Path wdir) throws Exception {
         final OutputStream stream =
             Files.newOutputStream(
diff --git a/src/test/java/org/cactoos/io/HeadInputStreamTest.java b/src/test/java/org/cactoos/io/HeadInputStreamTest.java
index af65f2ccb..8c15ed25f 100644
--- a/src/test/java/org/cactoos/io/HeadInputStreamTest.java
+++ b/src/test/java/org/cactoos/io/HeadInputStreamTest.java
@@ -42,73 +42,77 @@ final class HeadInputStreamTest {
 
     @Test
     void testSkippingLessThanTotal() throws Exception {
-        final HeadInputStream stream = new HeadInputStream(
+        try (HeadInputStream stream = new HeadInputStream(
             new InputOf("testSkippingLessThanTotal").stream(),
             5
-        );
-        final long skipped = stream.skip(3L);
-        new Assertion<>(
-            "Incorrect number of bytes skipped",
-            skipped,
-            new IsEqual<>(3L)
-        ).affirm();
-        new Assertion<>(
-            "Incorrect head of the input stream has been read",
-            new InputOf(stream),
-            new HasContent("tS")
-        ).affirm();
+        )) {
+            final long skipped = stream.skip(3L);
+            new Assertion<>(
+                "Incorrect number of bytes skipped",
+                skipped,
+                new IsEqual<>(3L)
+            ).affirm();
+            new Assertion<>(
+                "Incorrect head of the input stream has been read",
+                new InputOf(stream),
+                new HasContent("tS")
+            ).affirm();
+        }
     }
 
     @Test
     void testSkippingMoreThanTotal() throws Exception {
-        final HeadInputStream stream = new HeadInputStream(
+        try (HeadInputStream stream = new HeadInputStream(
             new InputOf("testSkippingMoreThanTotal").stream(),
             5
-        );
-        final long skipped = stream.skip(7L);
-        new Assertion<>(
-            "Incorrect number of bytes skipped",
-            skipped,
-            new IsEqual<>(5L)
-        ).affirm();
-        final String input = new TextOf(stream).asString();
-        new Assertion<>(
-            "The result text wasn't empty",
-            new TextOf(input),
-            new IsText("")
-        ).affirm();
+        )) {
+            final long skipped = stream.skip(7L);
+            new Assertion<>(
+                "Incorrect number of bytes skipped",
+                skipped,
+                new IsEqual<>(5L)
+            ).affirm();
+            final String input = new TextOf(stream).asString();
+            new Assertion<>(
+                "The result text wasn't empty",
+                new TextOf(input),
+                new IsText("")
+            ).affirm();
+        }
     }
 
     @Test
     void testResetting() throws Exception {
-        final HeadInputStream stream = new HeadInputStream(
+        try (HeadInputStream stream = new HeadInputStream(
             new InputOf("testResetting").stream(),
             5
-        );
-        final long skipped = stream.skip(7L);
-        new Assertion<>(
-            "Incorrect number of bytes skipped",
-            skipped,
-            new IsEqual<>(5L)
-        ).affirm();
-        stream.reset();
-        new Assertion<>(
-            "Reset didn't change the state",
-            new InputOf(stream),
-            new HasContent("testR")
-        ).affirm();
+        )) {
+            final long skipped = stream.skip(7L);
+            new Assertion<>(
+                "Incorrect number of bytes skipped",
+                skipped,
+                new IsEqual<>(5L)
+            ).affirm();
+            stream.reset();
+            new Assertion<>(
+                "Reset didn't change the state",
+                new InputOf(stream),
+                new HasContent("testR")
+            ).affirm();
+        }
     }
 
     @Test
     void testAvailableLessThanTotal() throws Exception {
-        final HeadInputStream stream = new HeadInputStream(
+        try (HeadInputStream stream = new HeadInputStream(
             new InputOf("testAvailableLessThanTotal").stream(),
             5
-        );
-        new Assertion<>(
-            "must count available bytes",
-            stream.available(),
-            new IsEqual<>(5)
-        ).affirm();
+        )) {
+            new Assertion<>(
+                "must count available bytes",
+                stream.available(),
+                new IsEqual<>(5)
+            ).affirm();
+        }
     }
 }
diff --git a/src/test/java/org/cactoos/io/InputOfTest.java b/src/test/java/org/cactoos/io/InputOfTest.java
index 1cdfecf88..e6fa4bcec 100644
--- a/src/test/java/org/cactoos/io/InputOfTest.java
+++ b/src/test/java/org/cactoos/io/InputOfTest.java
@@ -55,7 +55,6 @@
 /**
  * Test case for {@link InputOf}.
  *
- * @checkstyle ClassFanOutComplexityCheck (500 lines)
  * @since 0.1
  */
 @SuppressWarnings({"PMD.TooManyMethods", "PMD.ExcessiveImports",
@@ -297,7 +296,7 @@ void readsEncodedStringFromReader() throws Exception {
 
     @Test
     void readsAnArrayOfBytes() throws Exception {
-        final byte[] bytes = new byte[]{(byte) 0xCA, (byte) 0xFE};
+        final byte[] bytes = {(byte) 0xCA, (byte) 0xFE};
         new Assertion<>(
             "must read array of bytes",
             new BytesOf(
diff --git a/src/test/java/org/cactoos/io/LoggingInputStreamTest.java b/src/test/java/org/cactoos/io/LoggingInputStreamTest.java
index e3e119057..6c6fc3274 100644
--- a/src/test/java/org/cactoos/io/LoggingInputStreamTest.java
+++ b/src/test/java/org/cactoos/io/LoggingInputStreamTest.java
@@ -41,9 +41,9 @@
 final class LoggingInputStreamTest {
 
     @Test
-    void reThrowsException() {
+    void reThrowsException() throws IOException {
         final String message = "Some read exception.";
-        final LoggingInputStream stream = new LoggingInputStream(
+        try (LoggingInputStream stream = new LoggingInputStream(
             new InputStream() {
                 @Override
                 public int read() throws IOException {
@@ -51,12 +51,13 @@ public int read() throws IOException {
                 }
             },
             this.getClass().getSimpleName()
-        );
-        new Assertion<>(
-            "Read doesn't throw an the exception.",
-            stream::read,
-            new Throws<>(message, IOException.class)
-        ).affirm();
+        )) {
+            new Assertion<>(
+                "Read doesn't throw an the exception.",
+                stream::read,
+                new Throws<>(message, IOException.class)
+            ).affirm();
+        }
     }
 
     @Test
diff --git a/src/test/java/org/cactoos/io/LoggingInputTest.java b/src/test/java/org/cactoos/io/LoggingInputTest.java
index 3b87365e6..560de96a6 100644
--- a/src/test/java/org/cactoos/io/LoggingInputTest.java
+++ b/src/test/java/org/cactoos/io/LoggingInputTest.java
@@ -181,21 +181,22 @@ void logAvailableFromLargeTextFile() throws Exception {
     @SuppressWarnings("unchecked")
     void logResetFromLargeTextFile() throws Exception {
         final Logger logger = new FakeLogger();
-        final InputStream input = new LoggingInput(
+        try (InputStream input = new LoggingInput(
             new ResourceOf("org/cactoos/large-text.txt"),
             "text file",
             logger
-        ).stream();
-        input.mark(150);
-        input.reset();
-        new Assertion<>(
-            "Must log mark and reset from text file",
-            new TextOf(logger.toString()),
-            new AllOf<>(
-                new HasString("Marked position 150 from text file"),
-                new HasString("Reset input stream from text file")
-            )
-        ).affirm();
+        ).stream()) {
+            input.mark(150);
+            input.reset();
+            new Assertion<>(
+                "Must log mark and reset from text file",
+                new TextOf(logger.toString()),
+                new AllOf<>(
+                    new HasString("Marked position 150 from text file"),
+                    new HasString("Reset input stream from text file")
+                )
+            ).affirm();
+        }
     }
 
     @Test
diff --git a/src/test/java/org/cactoos/io/TailOfTest.java b/src/test/java/org/cactoos/io/TailOfTest.java
index 6863e7ad3..883d48aa1 100644
--- a/src/test/java/org/cactoos/io/TailOfTest.java
+++ b/src/test/java/org/cactoos/io/TailOfTest.java
@@ -135,7 +135,7 @@ void failsIfBufferSizeSmallerThanTailSize() throws Exception {
                     size - 1
                 )
             ).asBytes(),
-        new Throws<>(IllegalArgumentException.class)
+            new Throws<>(IllegalArgumentException.class)
         ).affirm();
     }
 
diff --git a/src/test/java/org/cactoos/io/TempFileTest.java b/src/test/java/org/cactoos/io/TempFileTest.java
index 272eaa877..5ffa28ce2 100644
--- a/src/test/java/org/cactoos/io/TempFileTest.java
+++ b/src/test/java/org/cactoos/io/TempFileTest.java
@@ -76,6 +76,7 @@ void createFileInCustomPath() throws Exception {
     }
 
     @Test
+    @SuppressWarnings("PMD.CloseResource")
     void deleteFile() throws Exception {
         final TempFile file = new TempFile();
         file.close();
diff --git a/src/test/java/org/cactoos/io/TempFolderTest.java b/src/test/java/org/cactoos/io/TempFolderTest.java
index 2ec180261..0a22c40cf 100644
--- a/src/test/java/org/cactoos/io/TempFolderTest.java
+++ b/src/test/java/org/cactoos/io/TempFolderTest.java
@@ -57,6 +57,7 @@ void createsDirectory() throws Exception {
     }
 
     @Test
+    @SuppressWarnings("PMD.CloseResource")
     void deletesDirectory() throws Exception {
         final TempFolder dir = new TempFolder(
             new Randomized('d', 'e', 'g').asString()
@@ -70,6 +71,7 @@ void deletesDirectory() throws Exception {
     }
 
     @Test
+    @SuppressWarnings("PMD.CloseResource")
     void deletesNonEmptyDirectory() throws Exception {
         final TempFolder temp = new TempFolder();
         final Path root = temp.value();
@@ -111,41 +113,41 @@ void deletesNonEmptyDirectory() throws Exception {
 
     @Test
     void createDirectoryWithDirectoriesAndFiles() throws Exception {
-        final TempFolder temp = new TempFolder();
-        final Path root = temp.value();
-        new ForEach<>(
-            new ProcOf<String>(
-                name -> {
-                    final Path dir = Files.createDirectories(
-                        new File(root.toFile(), name).toPath()
-                    );
-                    new ForEach<>(
-                        new ProcOf<String>(
-                            filename -> {
-                                new TempFile(
-                                    () -> dir,
-                                    filename,
-                                    ""
-                                ).value();
-                            }
-                        )
-                    ).exec(
-                        new IterableOf<>(
-                            "1.txt", "2.txt", "3.txt"
-                        )
-                    );
-                }
-            )
-        ).exec(
-            new IterableOf<>(
-                "1", "2", "3", "4", "5"
-            )
-        );
-        new Assertion<>(
-            "Directory contains files and sub directories",
-            temp.value().toFile().exists(),
-            new IsTrue()
-        ).affirm();
-        temp.close();
+        try (TempFolder temp = new TempFolder()) {
+            final Path root = temp.value();
+            new ForEach<>(
+                new ProcOf<String>(
+                    name -> {
+                        final Path dir = Files.createDirectories(
+                            new File(root.toFile(), name).toPath()
+                        );
+                        new ForEach<>(
+                            new ProcOf<String>(
+                                filename -> {
+                                    new TempFile(
+                                        () -> dir,
+                                        filename,
+                                        ""
+                                    ).value();
+                                }
+                            )
+                        ).exec(
+                            new IterableOf<>(
+                                "1.txt", "2.txt", "3.txt"
+                            )
+                        );
+                    }
+                )
+            ).exec(
+                new IterableOf<>(
+                    "1", "2", "3", "4", "5"
+                )
+            );
+            new Assertion<>(
+                "Directory contains files and sub directories",
+                temp.value().toFile().exists(),
+                new IsTrue()
+            ).affirm();
+        }
     }
 }
diff --git a/src/test/java/org/cactoos/iterable/IterableOfDoublesTest.java b/src/test/java/org/cactoos/iterable/IterableOfDoublesTest.java
index 4ab2ddca6..6019313a1 100644
--- a/src/test/java/org/cactoos/iterable/IterableOfDoublesTest.java
+++ b/src/test/java/org/cactoos/iterable/IterableOfDoublesTest.java
@@ -37,7 +37,7 @@ final class IterableOfDoublesTest {
 
     @Test
     void convertsDoubleValuesToIterable() {
-        final double[] values = new double[]{1, 2, 3};
+        final double[] values = {1, 2, 3};
         new Assertion<>(
             "Must convert double values to iterable",
             new IterableOfDoubles(values),
diff --git a/src/test/java/org/cactoos/iterable/IterableOfLongsTest.java b/src/test/java/org/cactoos/iterable/IterableOfLongsTest.java
index f076a891a..3134817bc 100644
--- a/src/test/java/org/cactoos/iterable/IterableOfLongsTest.java
+++ b/src/test/java/org/cactoos/iterable/IterableOfLongsTest.java
@@ -37,7 +37,7 @@ final class IterableOfLongsTest {
 
     @Test
     void convertsLongValuesToIterable() {
-        final long[] values = new long[]{1, 2, 3};
+        final long[] values = {1, 2, 3};
         new Assertion<>(
             "Must convert long values to iterable",
             new IterableOfLongs(values),
diff --git a/src/test/java/org/cactoos/iterable/IterableOfShortsTest.java b/src/test/java/org/cactoos/iterable/IterableOfShortsTest.java
index 93fdda713..570474e55 100644
--- a/src/test/java/org/cactoos/iterable/IterableOfShortsTest.java
+++ b/src/test/java/org/cactoos/iterable/IterableOfShortsTest.java
@@ -37,7 +37,7 @@ final class IterableOfShortsTest {
     @Test
     @SuppressWarnings("PMD.AvoidUsingShortType")
     void convertsShortValuesToIterable() {
-        final short[] values = new short[]{1, 2, 3};
+        final short[] values = {1, 2, 3};
         new Assertion<>(
             "Must convert short values to iterable",
             new IterableOfShorts(values),
diff --git a/src/test/java/org/cactoos/iterable/RangeOfTest.java b/src/test/java/org/cactoos/iterable/RangeOfTest.java
index 45e7d7805..d8614903a 100644
--- a/src/test/java/org/cactoos/iterable/RangeOfTest.java
+++ b/src/test/java/org/cactoos/iterable/RangeOfTest.java
@@ -50,7 +50,7 @@ void testIntegerRange() {
         new Assertion<>(
             "Must generate a range of integers",
             new ListOf<>(
-                new RangeOf<>(1, 5, value -> ++value)
+                new RangeOf<>(1, 5, value -> value + 1)
             ),
             Matchers.contains(1, 2, 3, 4, 5)
         ).affirm();
@@ -68,8 +68,7 @@ void testIntegerFibonacciRange() {
                         private int last;
 
                         @Override
-                        public Integer apply(
-                            final Integer input) throws Exception {
+                        public Integer apply(final Integer input) {
                             final int next = this.last + input;
                             this.last = input;
                             return next;
@@ -86,7 +85,7 @@ void testLongRange() {
         new Assertion<>(
             "Must generate a range of long",
             new ListOf<>(
-                new RangeOf<>(1L, 5L, value -> ++value)
+                new RangeOf<>(1L, 5L, value -> value + 1)
             ),
             Matchers.contains(1L, 2L, 3L, 4L, 5L)
         ).affirm();
@@ -97,7 +96,7 @@ void testCharacterRange() {
         new Assertion<>(
             "Must generate a range of characters",
             new ListOf<>(
-                new RangeOf<>('a', 'c', value -> ++value)
+                new RangeOf<>('a', 'c', value -> (char) (value + 1))
             ),
             Matchers.contains('a', 'b', 'c')
         ).affirm();
@@ -124,7 +123,9 @@ void testLocalDateRange() {
 
     @Test
     void shouldBeTraversableMultipleTimes() throws Exception {
-        final Iterable<Character> range = new RangeOf<>('a', 'c', value -> ++value);
+        final Iterable<Character> range = new RangeOf<>(
+            'a', 'c', value -> (char) (value + 1)
+        );
         final Collection<Character> copy = new ArrayList<>(6);
         new RepeatedProc<>(new ForEach<>(copy::add), 2).exec(range);
         new Assertion<>(
@@ -136,7 +137,9 @@ void shouldBeTraversableMultipleTimes() throws Exception {
 
     @Test
     void shouldNotChangeAfterTraversing() throws Exception {
-        final Iterable<Character> range = new RangeOf<>('a', 'c', value -> ++value);
+        final Iterable<Character> range = new RangeOf<>(
+            'a', 'c', value -> (char) (value + 1)
+        );
         new ForEach<>(
             (Character ignored) -> {
             }
@@ -145,7 +148,7 @@ void shouldNotChangeAfterTraversing() throws Exception {
             "Must be equal",
             range,
             new IsEqual<>(
-                new RangeOf<>('a', 'c', value -> ++value)
+                new RangeOf<>('a', 'c', value -> (char) (value + 1))
             )
         ).affirm();
     }
@@ -156,9 +159,9 @@ void producesChars() {
         new Assertion<>(
             "Must produce three ranges",
             new Joined<>(
-                new RangeOf<>('0', '9', ch -> ++ch),
-                new RangeOf<>('A', 'Z', ch -> ++ch),
-                new RangeOf<>('a', 'z', ch -> ++ch)
+                new RangeOf<>('0', '9', ch -> (char) (ch + 1)),
+                new RangeOf<>('A', 'Z', ch -> (char) (ch + 1)),
+                new RangeOf<>('a', 'z', ch -> (char) (ch + 1))
             ),
             new IsEqual<>(
                 new IterableOfChars(
@@ -178,7 +181,7 @@ void producesChars() {
     void producesCharsJoined() {
         new Assertion<>(
             "Must produce correct range of characters",
-            new RangeOf<>('!', '~', ch -> ++ch),
+            new RangeOf<>('!', '~', ch -> (char) (ch + 1)),
             new IsEqual<>(
                 new IterableOfChars(
                     '!', '"', '#', '$', '%', '&', '\'', '(', ')', '*',
diff --git a/src/test/java/org/cactoos/iterable/SolidTest.java b/src/test/java/org/cactoos/iterable/SolidTest.java
index 450b54b31..a7491e54a 100644
--- a/src/test/java/org/cactoos/iterable/SolidTest.java
+++ b/src/test/java/org/cactoos/iterable/SolidTest.java
@@ -81,6 +81,7 @@ void worksInThreads() {
             "Can't behave as an iterable in multiple threads",
             list -> {
                 MatcherAssert.assertThat(
+                    "Iterator should be the same",
                     list.iterator().next(),
                     Matchers.equalTo(list.iterator().next())
                 );
diff --git a/src/test/java/org/cactoos/iterable/SyncedTest.java b/src/test/java/org/cactoos/iterable/SyncedTest.java
index c460e646b..7d349fddb 100644
--- a/src/test/java/org/cactoos/iterable/SyncedTest.java
+++ b/src/test/java/org/cactoos/iterable/SyncedTest.java
@@ -41,6 +41,7 @@ void worksInThreads() {
             "Can't behave as an iterable in multiple threads",
             list -> {
                 MatcherAssert.assertThat(
+                    "Should be the same iterator",
                     list.iterator().next(),
                     Matchers.equalTo(list.iterator().next())
                 );
diff --git a/src/test/java/org/cactoos/iterator/RangeOfTest.java b/src/test/java/org/cactoos/iterator/RangeOfTest.java
index 5bf2dd65e..b81df87d6 100644
--- a/src/test/java/org/cactoos/iterator/RangeOfTest.java
+++ b/src/test/java/org/cactoos/iterator/RangeOfTest.java
@@ -43,7 +43,7 @@ void testIntegerRange() {
         new Assertion<>(
             "Must generate a range of integers",
             new ListOf<>(
-                new RangeOf<>(1, 5, value -> ++value)
+                new RangeOf<>(1, 5, value -> value + 1)
             ),
             new HasValues<>(1, 2, 3, 4, 5)
         ).affirm();
@@ -74,7 +74,7 @@ void testLongRange() {
         new Assertion<>(
             "Must generate a range of long",
             new ListOf<>(
-                new RangeOf<>(1L, 5L, value -> ++value)
+                new RangeOf<>(1L, 5L, value -> value + 1)
             ),
             new HasValues<>(1L, 2L, 3L, 4L, 5L)
         ).affirm();
@@ -85,7 +85,7 @@ void testCharacterRange() {
         new Assertion<>(
             "Must generate a range of characters.",
             new ListOf<>(
-                new RangeOf<>('a', 'c', value -> ++value)
+                new RangeOf<>('a', 'c', value -> (char) (value + 1))
             ),
             new HasValues<>('a', 'b', 'c')
         ).affirm();
diff --git a/src/test/java/org/cactoos/list/JoinedTest.java b/src/test/java/org/cactoos/list/JoinedTest.java
index fbad64ee6..d438c23c0 100644
--- a/src/test/java/org/cactoos/list/JoinedTest.java
+++ b/src/test/java/org/cactoos/list/JoinedTest.java
@@ -42,7 +42,9 @@
  * @checkstyle DiamondOperatorCheck (500 lines)
  */
 @SuppressWarnings({"PMD.TooManyMethods",
-    "PMD.JUnitTestsShouldIncludeAssert"})
+    "PMD.JUnitTestsShouldIncludeAssert",
+    "PMD.UseDiamondOperator"
+})
 final class JoinedTest {
 
     /**
diff --git a/src/test/java/org/cactoos/list/ListEnvelopeTest.java b/src/test/java/org/cactoos/list/ListEnvelopeTest.java
index eb51ef9e0..85b31c970 100644
--- a/src/test/java/org/cactoos/list/ListEnvelopeTest.java
+++ b/src/test/java/org/cactoos/list/ListEnvelopeTest.java
@@ -113,6 +113,7 @@ void addIsDelegated() {
         ).affirm();
     }
 
+    @Test
     void returnsSubListWithRemove() {
         final ListEnvelope<String> list = new StringList("one");
         list.subList(0, 1).remove(0);
diff --git a/src/test/java/org/cactoos/list/SyncedTest.java b/src/test/java/org/cactoos/list/SyncedTest.java
index 09657b8dc..21321924e 100644
--- a/src/test/java/org/cactoos/list/SyncedTest.java
+++ b/src/test/java/org/cactoos/list/SyncedTest.java
@@ -26,6 +26,7 @@
 import java.util.Collections;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
+import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.RunsInThreads;
 
 /**
@@ -38,29 +39,32 @@
 final class SyncedTest {
 
     @Test
-    void behavesAsCollection() throws Exception {
-        MatcherAssert.assertThat(
+    void behavesAsCollection() {
+        new Assertion<>(
             "Can't behave as a list",
             new Synced<>(new ListOf<>(1, 0, -1, -1, 2)),
             new BehavesAsList<>(0)
-        );
+        ).affirm();
     }
 
     @Test
     void worksInThreads() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "should be run in threads",
             list -> !list.iterator().hasNext(),
             new RunsInThreads<>(new Synced<>(Collections.emptyList()))
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "should work as list",
             list -> {
                 MatcherAssert.assertThat(
+                    "should behave as a list",
                     list,
                     new BehavesAsList<>(0)
                 );
                 return true;
             },
             new RunsInThreads<>(new Synced<>(new ListOf<>(1, 0, -1, -1, 2)))
-        );
+        ).affirm();
     }
 }
diff --git a/src/test/java/org/cactoos/map/MapEnvelopeTest.java b/src/test/java/org/cactoos/map/MapEnvelopeTest.java
index e23381fbf..854230d72 100644
--- a/src/test/java/org/cactoos/map/MapEnvelopeTest.java
+++ b/src/test/java/org/cactoos/map/MapEnvelopeTest.java
@@ -122,7 +122,7 @@ void mapContainsValueFalse() {
     @Test
     void mapEqualsToItself() {
         final MapOf<String, String> map =
-            new MapOf<String, String>(new MapEntry<>("key", "value"));
+            new MapOf<>(new MapEntry<>("key", "value"));
         MatcherAssert.assertThat(
             "Map doesn't equal to itself",
             map,
@@ -133,7 +133,7 @@ void mapEqualsToItself() {
     @Test
     void mapNotEqualsToAnotherClass() {
         final MapOf<String, String> map =
-            new MapOf<String, String>(new MapEntry<>("key1", "value1"));
+            new MapOf<>(new MapEntry<>("key1", "value1"));
         MatcherAssert.assertThat(
             "Map equals to an instance of another type",
             map,
diff --git a/src/test/java/org/cactoos/map/NoNullsTest.java b/src/test/java/org/cactoos/map/NoNullsTest.java
index 73c32c10e..31a9ec6b6 100644
--- a/src/test/java/org/cactoos/map/NoNullsTest.java
+++ b/src/test/java/org/cactoos/map/NoNullsTest.java
@@ -45,7 +45,9 @@
 @SuppressWarnings({"PMD.TooManyMethods",
     "PMD.NonStaticInitializer",
     "serial",
-    "PMD.JUnitTestsShouldIncludeAssert"})
+    "PMD.JUnitTestsShouldIncludeAssert",
+    "PMD.DoubleBraceInitialization"
+})
 final class NoNullsTest {
 
     @Test
@@ -205,17 +207,17 @@ void getValueByNullValue() {
 
     @Test
     void put() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
             "Can't call #put()",
-            new NoNulls<Integer, Integer>(
+            new NoNulls<>(
                 new HashMap<Integer, Integer>() {
                     {
                         put(0, 0);
                     }
                 }
             ),
-            new PutUpdatesValues<Integer, Integer>(0, 1)
-        );
+            new PutUpdatesValues<>(0, 1)
+        ).affirm();
     }
 
     @Test
diff --git a/src/test/java/org/cactoos/number/AvgOfTest.java b/src/test/java/org/cactoos/number/AvgOfTest.java
index 80a0e82cc..05eb7c19e 100644
--- a/src/test/java/org/cactoos/number/AvgOfTest.java
+++ b/src/test/java/org/cactoos/number/AvgOfTest.java
@@ -243,7 +243,7 @@ void withDoubleCollectionNaN() {
             () -> new AvgOf(
                 Double.NaN, Double.NaN
             ).doubleValue(),
-        new Throws<>(NumberFormatException.class)
+            new Throws<>(NumberFormatException.class)
         ).affirm();
     }
 
diff --git a/src/test/java/org/cactoos/number/MinOfTest.java b/src/test/java/org/cactoos/number/MinOfTest.java
index a2a36f141..6ea70d9b1 100644
--- a/src/test/java/org/cactoos/number/MinOfTest.java
+++ b/src/test/java/org/cactoos/number/MinOfTest.java
@@ -24,9 +24,9 @@
 package org.cactoos.number;
 
 import org.cactoos.list.ListOf;
-import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
+import org.llorllale.cactoos.matchers.Assertion;
 
 /**
  * Test case for {@link MinOf}.
@@ -37,114 +37,130 @@ final class MinOfTest {
 
     @Test
     void withIntegerCollection() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "must select minimum integer of positive integers",
             new MinOf(
                 new ListOf<>(1, 2, 3, 4).toArray(new Integer[4])
             ).intValue(),
             Matchers.equalTo(1)
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "must select minimum long of positive integers",
             new MinOf(
                 new ListOf<>(1, 2, 3, 4).toArray(new Integer[4])
             ).longValue(),
             Matchers.equalTo(1L)
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "must select minimum double of positive integers",
             new MinOf(
                 new ListOf<>(1, 2, 3, 4).toArray(new Integer[4])
             ).doubleValue(),
             Matchers.equalTo(1.0d)
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "must select minimum float of positive integers",
             new MinOf(
                 new ListOf<>(1, 2, 3, 4).toArray(new Integer[4])
             ).floatValue(),
             Matchers.equalTo(1.0f)
-        );
+        ).affirm();
     }
 
     @Test
     void withLongCollection() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "must select minimum integer of positive longs",
             new MinOf(
                 new ListOf<>(1L, 2L, 3L, 4L).toArray(new Long[4])
             ).intValue(),
             Matchers.equalTo(1)
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "must select minimum long of positive longs",
             new MinOf(
                 new ListOf<>(1L, 2L, 3L, 4L).toArray(new Long[4])
             ).longValue(),
             Matchers.equalTo(1L)
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "must select minimum double of positive longs",
             new MinOf(
                 new ListOf<>(1L, 2L, 3L, 4L).toArray(new Long[4])
             ).doubleValue(),
             Matchers.equalTo(1.0d)
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "must select minimum float of positive longs",
             new MinOf(
                 new ListOf<>(1L, 2L, 3L, 4L).toArray(new Long[4])
             ).floatValue(),
             Matchers.equalTo(1.0f)
-        );
+        ).affirm();
     }
 
     @Test
     void withDoubleCollection() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "must select minimum integer of positive doubles",
             new MinOf(
                 new ListOf<>(1.0d, 2.0d, 3.0d, 4.0d).toArray(new Double[4])
             ).intValue(),
             Matchers.equalTo(1)
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "must select minimum long of positive doubles",
             new MinOf(
                 new ListOf<>(1.0d, 2.0d, 3.0d, 4.0d).toArray(new Double[4])
             ).longValue(),
             Matchers.equalTo(1L)
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "must select minimum double of positive doubles",
             new MinOf(
                 new ListOf<>(1.0d, 2.0d, 3.0d, 4.0d).toArray(new Double[4])
             ).doubleValue(),
             Matchers.equalTo(1.0d)
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "must select minimum float of positive doubles",
             new MinOf(
                 new ListOf<>(1.0d, 2.0d, 3.0d, 4.0d).toArray(new Double[4])
             ).floatValue(),
             Matchers.equalTo(1.0f)
-        );
+        ).affirm();
     }
 
     @Test
     void withFloatCollection() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "must select minimum integer of positive floats",
             new MinOf(
                 new ListOf<>(1.0f, 2.0f, 3.0f, 4.0f).toArray(new Float[4])
             ).intValue(),
             Matchers.equalTo(1)
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "must select minimum long of positive floats",
             new MinOf(
                 new ListOf<>(1.0f, 2.0f, 3.0f, 4.0f).toArray(new Float[4])
             ).longValue(),
             Matchers.equalTo(1L)
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "must select minimum float of positive floats",
             new MinOf(
                 new ListOf<>(1.0f, 2.0f, 3.0f, 4.0f).toArray(new Float[4])
             ).doubleValue(),
             Matchers.equalTo(1.0d)
-        );
-        MatcherAssert.assertThat(
+        ).affirm();
+        new Assertion<>(
+            "must select minimum float of positive floats",
             new MinOf(
                 new ListOf<>(1.0f, 2.0f, 3.0f, 4.0f).toArray(new Float[4])
             ).floatValue(),
             Matchers.equalTo(1.0f)
-        );
+        ).affirm();
     }
 
 }
diff --git a/src/test/java/org/cactoos/number/NumberOfTest.java b/src/test/java/org/cactoos/number/NumberOfTest.java
index 5f35fb322..058e7bbdd 100644
--- a/src/test/java/org/cactoos/number/NumberOfTest.java
+++ b/src/test/java/org/cactoos/number/NumberOfTest.java
@@ -96,7 +96,7 @@ void parsesDouble() throws IOException {
         new Assertion<>(
             "Must parse double number",
             new NumberOf("185.65156465123").doubleValue(),
-            new IsNumber(185.65_156_465_123)
+            new IsNumber(185.651_564_651_23)
         ).affirm();
     }
 
diff --git a/src/test/java/org/cactoos/number/SumOfTest.java b/src/test/java/org/cactoos/number/SumOfTest.java
index 8d8d3429a..b1f2bf6af 100644
--- a/src/test/java/org/cactoos/number/SumOfTest.java
+++ b/src/test/java/org/cactoos/number/SumOfTest.java
@@ -26,9 +26,10 @@
 import java.util.Collection;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.list.ListOf;
-import org.hamcrest.MatcherAssert;
+import org.cactoos.text.Joined;
 import org.hamcrest.core.IsEqual;
 import org.junit.jupiter.api.Test;
+import org.llorllale.cactoos.matchers.Assertion;
 
 /**
  * Test case for {@link SumOf}.
@@ -46,110 +47,126 @@ final class SumOfTest {
 
     @Test
     void withListOfNumbersInt() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "sum of integers should be calculated as integer",
             new SumOf(1, 2, 3).intValue(),
             new IsEqual<>(6)
-        );
+        ).affirm();
     }
 
     @Test
     void withListOfNumbersDouble() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "sum of doubles should be calculated as double",
             new SumOf(1.0d, 2.0d, 3.0d).doubleValue(),
             new IsEqual<>(6.0d)
-        );
+        ).affirm();
     }
 
     @Test
     void withListOfNumbersFloat() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "sum of floats should be calculated as float",
             new SumOf(1.0f, 2.0f, 3.0f).floatValue(),
             new IsEqual<>(6.0f)
-        );
+        ).affirm();
     }
 
     @Test
     void withListOfNumbersLong() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "sum of longs should be calculated as long",
             new SumOf(1L, 2L, 3L).longValue(),
             new IsEqual<>(6L)
-        );
+        ).affirm();
     }
 
     @Test
     void withCollectionLong() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "sum of longs should be calculated as long",
             new SumOf(
                 new IterableOf<>(1, 2, 3, 4)
             ).longValue(),
             new IsEqual<>(10L)
-        );
+        ).affirm();
     }
 
     @Test
     void withCollectionInt() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "sum of longs should be calculated as integer",
             new SumOf(
                 new IterableOf<>(1L, 2L, 3L, 4L)
             ).intValue(),
             new IsEqual<>(10)
-        );
+        ).affirm();
     }
 
     @Test
     void withCollectionFloat() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "sum of floats should be calculated as float",
             new SumOf(
                 new IterableOf<>(1.0f, 2.0f, 3.0f, 4.0f)
             ).floatValue(),
             new IsEqual<>(10.0f)
-        );
+        ).affirm();
     }
 
     @Test
     void withCollectionDouble() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "sum of double should be calculated as double",
             new SumOf(
                 new IterableOf<>(1.0d, 2.0d, 3.0d, 4.0d)
             ).doubleValue(),
             new IsEqual<>(10.0d)
-        );
+        ).affirm();
     }
 
     @Test
     void withIterableOfInts() {
         final Collection<Integer> ints = new ListOf<>(1, 2, 3, 4);
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "sum of integers should be calculated as integer",
             new SumOf(ints).intValue(),
             new IsEqual<>(10)
-        );
+        ).affirm();
     }
 
     @Test
     void overflowIntFromLongValues() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "sum of longs should be calculated as integer without overflow error",
             new SumOf(2_147_483_647L + 1L << 1, 10L).intValue(),
             new IsEqual<>(10)
-        );
+        ).affirm();
     }
 
     @Test
-    void overflowIntFromLongValuesIncludingNegative() {
-        MatcherAssert.assertThat(
+    void overflowIntFromLongValuesIncludingNegative() throws Exception {
+        new Assertion<>(
+            new Joined(
+                "",
+                "sum of positive and negative longs should be calculated",
+                "as integer without overflow error"
+            ).asString(),
             new SumOf(
                 2_147_483_647L + 1L << 1,
                 10L,
                 -(2_147_483_647L + 1L) << 1
             ).intValue(),
             new IsEqual<>(10)
-        );
+        ).affirm();
     }
 
     @Test
     void overflowFloatFromLongValues() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "sum of longs should be calculated as float",
             new SumOf(2_147_483_647L + 1L << 1, 10L).floatValue(),
             new IsEqual<>(4_294_967_300.0f)
-        );
+        ).affirm();
     }
 }
diff --git a/src/test/java/org/cactoos/proc/BiProcOfTest.java b/src/test/java/org/cactoos/proc/BiProcOfTest.java
index 2e0d3fb99..5c79f5af6 100644
--- a/src/test/java/org/cactoos/proc/BiProcOfTest.java
+++ b/src/test/java/org/cactoos/proc/BiProcOfTest.java
@@ -52,7 +52,7 @@ void worksWithFunc() throws Exception {
                     final Object first = new Object();
                     final Object second = new Object();
                     proc.exec(first, second);
-                    return done.get() == first;
+                    return done.get().equals(first);
                 }
             )
         ).affirm();
@@ -74,7 +74,7 @@ void worksWithBiFunc() throws Exception {
                     final Object first = new Object();
                     final Object second = new Object();
                     proc.exec(first, second);
-                    return done.get() == first;
+                    return done.get().equals(first);
                 }
             )
         ).affirm();
@@ -95,7 +95,7 @@ void worksWithProc() throws Exception {
                     final Object first = new Object();
                     final Object second = new Object();
                     proc.exec(first, second);
-                    return done.get() == first;
+                    return done.get().equals(first);
                 }
             )
         ).affirm();
@@ -116,7 +116,7 @@ void worksWithBiProc() throws Exception {
                     final Object first = new Object();
                     final Object second = new Object();
                     proc.exec(first, second);
-                    return done.get() == first;
+                    return done.get().equals(first);
                 }
             )
         ).affirm();
diff --git a/src/test/java/org/cactoos/proc/ProcOfTest.java b/src/test/java/org/cactoos/proc/ProcOfTest.java
index b50a11a24..66c9118cd 100644
--- a/src/test/java/org/cactoos/proc/ProcOfTest.java
+++ b/src/test/java/org/cactoos/proc/ProcOfTest.java
@@ -52,7 +52,7 @@ void worksWithFunc() throws Exception {
                 proc -> {
                     final Object input = new Object();
                     proc.exec(input);
-                    return done.get() == input;
+                    return done.get().equals(input);
                 }
             )
         ).affirm();
@@ -70,7 +70,7 @@ void worksWithLambda() throws Exception {
                 proc -> {
                     final Object input = new Object();
                     proc.exec(input);
-                    return done.get() == input;
+                    return done.get().equals(input);
                 }
             )
         ).affirm();
diff --git a/src/test/java/org/cactoos/scalar/AndInThreadsTest.java b/src/test/java/org/cactoos/scalar/AndInThreadsTest.java
index ba295808f..cf0e3734b 100644
--- a/src/test/java/org/cactoos/scalar/AndInThreadsTest.java
+++ b/src/test/java/org/cactoos/scalar/AndInThreadsTest.java
@@ -33,7 +33,6 @@
 import org.cactoos.list.ListOf;
 import org.cactoos.list.Synced;
 import org.cactoos.proc.ProcNoNulls;
-import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.hamcrest.collection.IsIterableContainingInAnyOrder;
 import org.hamcrest.core.IsEqual;
@@ -49,7 +48,7 @@
 final class AndInThreadsTest {
 
     @Test
-    void allTrue() throws Exception {
+    void allTrue() {
         new Assertion<>(
             "Each object must be True",
             new AndInThreads(
@@ -62,7 +61,7 @@ void allTrue() throws Exception {
     }
 
     @Test
-    void oneFalse() throws Exception {
+    void oneFalse() {
         new Assertion<>(
             "One object must be False",
             new AndInThreads(
@@ -75,7 +74,7 @@ void oneFalse() throws Exception {
     }
 
     @Test
-    void allFalse() throws Exception {
+    void allFalse() {
         new Assertion<>(
             "Each object must be False",
             new AndInThreads(
@@ -90,7 +89,7 @@ void allFalse() throws Exception {
     }
 
     @Test
-    void emptyIterable() throws Exception {
+    void emptyIterable() {
         new Assertion<>(
             "Must iterate over empty iterable",
             new AndInThreads(new IterableOf<>()),
@@ -124,27 +123,29 @@ void iteratesList() {
     }
 
     @Test
-    void worksWithFunc() throws Exception {
-        MatcherAssert.assertThat(
+    void worksWithFunc() {
+        new Assertion<>(
+            "Result should be calculated for integers",
             new AndInThreads(
                 input -> input > 0,
                 1, -1, 0
             ),
             new HasValue<>(false)
-        );
+        ).affirm();
     }
 
     @Test
-    void worksWithIterableScalarBoolean() throws Exception {
-        MatcherAssert.assertThat(
+    void worksWithIterableScalarBoolean() {
+        new Assertion<>(
+            "Result should be calculated from booleans",
             new AndInThreads(
                 new ListOf<Scalar<Boolean>>(
                     new Constant<>(true),
                     new Constant<>(true)
                 )
-            ).value(),
-            Matchers.equalTo(true)
-        );
+            ),
+            new HasValue<>(true)
+        ).affirm();
     }
 
     @Test
@@ -156,7 +157,8 @@ void worksWithExecServiceProcValues() throws Exception {
             new ProcNoNulls<Integer>(list::add),
             1, 2
         ).value();
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "Result should be calculated for proc values",
             list,
             new IsIterableContainingInAnyOrder<>(
                 new ListOf<>(
@@ -164,7 +166,7 @@ void worksWithExecServiceProcValues() throws Exception {
                     new IsEqual<>(2)
                 )
             )
-        );
+        ).affirm();
     }
 
     @Test
@@ -176,7 +178,8 @@ void worksWithExecServiceProcIterable() throws Exception {
             new ProcNoNulls<Integer>(list::add),
             new ListOf<>(1, 2)
         ).value();
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "Result should be calculated for proc iterables",
             list,
             new IsIterableContainingInAnyOrder<>(
                 new ListOf<>(
@@ -184,24 +187,26 @@ void worksWithExecServiceProcIterable() throws Exception {
                     new IsEqual<>(2)
                 )
             )
-        );
+        ).affirm();
     }
 
     @Test
     void worksWithExecServiceScalarBooleans() throws Exception {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "Result should be calculated for threads booleans",
             new AndInThreads(
                 Executors.newSingleThreadExecutor(),
                 new Constant<>(false),
                 new Constant<>(false)
             ).value(),
             Matchers.equalTo(false)
-        );
+        ).affirm();
     }
 
     @Test
     void worksWithExecServiceIterableScalarBoolean() throws Exception {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "Result should be calculated for threads iterable booleans",
             new AndInThreads(
                 Executors.newSingleThreadExecutor(),
                 new ListOf<Scalar<Boolean>>(
@@ -210,17 +215,18 @@ void worksWithExecServiceIterableScalarBoolean() throws Exception {
                 )
             ).value(),
             Matchers.equalTo(false)
-        );
+        ).affirm();
     }
 
     @Test
     void worksWithEmptyIterableScalarBoolean() throws Exception {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "Result should be calculated for empty iterable",
             new AndInThreads(
                 new ListOf<>()
             ).value(),
             Matchers.equalTo(true)
-        );
+        ).affirm();
     }
 
 }
diff --git a/src/test/java/org/cactoos/scalar/AndTest.java b/src/test/java/org/cactoos/scalar/AndTest.java
index 33ec8c410..6644095b0 100644
--- a/src/test/java/org/cactoos/scalar/AndTest.java
+++ b/src/test/java/org/cactoos/scalar/AndTest.java
@@ -25,7 +25,6 @@
 
 import org.cactoos.Scalar;
 import org.cactoos.iterable.IterableOf;
-import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.HasValue;
@@ -39,7 +38,7 @@
 final class AndTest {
 
     @Test
-    void allTrue() throws Exception {
+    void allTrue() {
         new Assertion<>(
             "Each object must be True",
             new And(
@@ -52,7 +51,7 @@ void allTrue() throws Exception {
     }
 
     @Test
-    void oneFalse() throws Exception {
+    void oneFalse() {
         new Assertion<>(
             "One object must be False",
             new And(
@@ -65,7 +64,7 @@ void oneFalse() throws Exception {
     }
 
     @Test
-    void allFalse() throws Exception {
+    void allFalse() {
         new Assertion<>(
             "Each object must be False",
             new And(
@@ -80,7 +79,7 @@ void allFalse() throws Exception {
     }
 
     @Test
-    void emptyIterator() throws Exception {
+    void emptyIterator() {
         new Assertion<>(
             "Iterator must be empty",
             new And(new IterableOf<Scalar<Boolean>>()),
@@ -89,41 +88,32 @@ void emptyIterator() throws Exception {
     }
 
     @Test
-    void testFuncIterable() throws Exception {
-        MatcherAssert.assertThat(
-            new And(
-                input -> input > 0,
-                new IterableOf<Integer>(1, -1, 0)
-            ),
-            new HasValue<>(false)
-        );
-    }
-
-    @Test
-    void testFuncIterator() throws Exception {
-        MatcherAssert.assertThat(
+    void testFuncIterable() {
+        new Assertion<>(
+            "lambda should be called for iterable",
             new And(
                 input -> input > 0,
-                new IterableOf<Integer>(1, -1, 0)
+                new IterableOf<>(1, -1, 0)
             ),
             new HasValue<>(false)
-        );
+        ).affirm();
     }
 
     @Test
-    void testFuncVarargs() throws Exception {
-        MatcherAssert.assertThat(
+    void testFuncVarargs() {
+        new Assertion<>(
+            "lambda should be called for varargs",
             new And(
                 input -> input > 0,
                 -1, -2, 0
             ),
             new HasValue<>(false)
-        );
+        ).affirm();
     }
 
     @Test
-    void testMultipleFuncConditionTrue() throws Exception {
-        MatcherAssert.assertThat(
+    void testMultipleFuncConditionTrue() {
+        new Assertion<>(
             "Can't compare subject with true conditions",
             new And(
                 3,
@@ -132,12 +122,12 @@ void testMultipleFuncConditionTrue() throws Exception {
                 input -> input > 4
             ),
             new HasValue<>(false)
-        );
+        ).affirm();
     }
 
     @Test
-    void testMultipleFuncConditionFalse() throws Exception {
-        MatcherAssert.assertThat(
+    void testMultipleFuncConditionFalse() {
+        new Assertion<>(
             "Can't compare subject with false conditions",
             new And(
                 "cactoos",
@@ -145,6 +135,6 @@ void testMultipleFuncConditionFalse() throws Exception {
                 input -> input.contains("static")
             ),
             new HasValue<>(false)
-        );
+        ).affirm();
     }
 }
diff --git a/src/test/java/org/cactoos/scalar/CheckedTest.java b/src/test/java/org/cactoos/scalar/CheckedTest.java
index 4360d29c7..871389ad1 100644
--- a/src/test/java/org/cactoos/scalar/CheckedTest.java
+++ b/src/test/java/org/cactoos/scalar/CheckedTest.java
@@ -74,7 +74,7 @@ void usesContravarianceOnResultType() throws Exception {
         new Assertion<>(
             "Must use contravariance on result",
             new Checked<CharSequence, IOException>(
-                () -> new String("contravariance"),
+                () -> "contravariance",
                 IOException::new
             ).value(),
             new IsEqual<>("contravariance")
diff --git a/src/test/java/org/cactoos/scalar/FoldedTest.java b/src/test/java/org/cactoos/scalar/FoldedTest.java
index e8461ea8c..395a3b9a6 100644
--- a/src/test/java/org/cactoos/scalar/FoldedTest.java
+++ b/src/test/java/org/cactoos/scalar/FoldedTest.java
@@ -45,7 +45,7 @@ void skipIterable() throws Exception {
                 0L, Long::sum,
                 new HeadOf<>(
                     10,
-                    new RangeOf<>(0L, Long.MAX_VALUE, value -> ++value)
+                    new RangeOf<>(0L, Long.MAX_VALUE, value -> value + 1)
                 )
             ),
             new HasValue<>(45L)
diff --git a/src/test/java/org/cactoos/scalar/InheritanceLevelTest.java b/src/test/java/org/cactoos/scalar/InheritanceLevelTest.java
index 0c01a08b5..075d9c02c 100644
--- a/src/test/java/org/cactoos/scalar/InheritanceLevelTest.java
+++ b/src/test/java/org/cactoos/scalar/InheritanceLevelTest.java
@@ -24,8 +24,8 @@
 package org.cactoos.scalar;
 
 import java.io.FileNotFoundException;
-import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
+import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.HasValue;
 
 /**
@@ -38,34 +38,37 @@ final class InheritanceLevelTest {
 
     @Test
     void twoInheritanceLevelsBetweenClasses() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "level should be calculated for inherited classes",
             new InheritanceLevel(
                 FileNotFoundException.class,
                 Exception.class
             ),
             new HasValue<>(2)
-        );
+        ).affirm();
     }
 
     @Test
     void classesAreNotRelated() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "level should be calculated for not related classes",
             new InheritanceLevel(
                 FileNotFoundException.class,
                 RuntimeException.class
             ),
             new HasValue<>(Integer.MIN_VALUE)
-        );
+        ).affirm();
     }
 
     @Test
     void classesAreIdentical() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "0 level should be calculated for equal classes",
             new InheritanceLevel(
                 FileNotFoundException.class,
                 FileNotFoundException.class
             ),
             new HasValue<>(0)
-        );
+        ).affirm();
     }
 }
diff --git a/src/test/java/org/cactoos/scalar/OrTest.java b/src/test/java/org/cactoos/scalar/OrTest.java
index 5e4c9c09f..c07b662c7 100644
--- a/src/test/java/org/cactoos/scalar/OrTest.java
+++ b/src/test/java/org/cactoos/scalar/OrTest.java
@@ -28,9 +28,9 @@
 import org.cactoos.Proc;
 import org.cactoos.Scalar;
 import org.cactoos.iterable.IterableOf;
-import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
+import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.HasValue;
 
 /**
@@ -43,8 +43,9 @@
 final class OrTest {
 
     @Test
-    void allFalse() throws Exception {
-        MatcherAssert.assertThat(
+    void allFalse() {
+        new Assertion<>(
+            "value should be calculated for all false",
             new Or(
                 new False(),
                 new False(),
@@ -53,12 +54,13 @@ void allFalse() throws Exception {
                 new False()
             ),
             new HasValue<>(false)
-        );
+        ).affirm();
     }
 
     @Test
-    void oneTrue() throws Exception {
-        MatcherAssert.assertThat(
+    void oneTrue() {
+        new Assertion<>(
+            "value should be calculated for all false except one",
             new Or(
                 new False(),
                 new True(),
@@ -67,12 +69,13 @@ void oneTrue() throws Exception {
                 new False()
             ),
             new HasValue<>(true)
-        );
+        ).affirm();
     }
 
     @Test
-    void allTrue() throws Exception {
-        MatcherAssert.assertThat(
+    void allTrue() {
+        new Assertion<>(
+            "value should be calculated for all true",
             new Or(
                 new IterableOf<Scalar<Boolean>>(
                     new True(),
@@ -83,15 +86,16 @@ void allTrue() throws Exception {
                 )
             ),
             new HasValue<>(true)
-        );
+        ).affirm();
     }
 
     @Test
-    void emptyIterator() throws Exception {
-        MatcherAssert.assertThat(
+    void emptyIterator() {
+        new Assertion<>(
+            "false should be a result for empty iterable",
             new Or(new IterableOf<Scalar<Boolean>>()),
             new HasValue<>(false)
-        );
+        ).affirm();
     }
 
     @Test
@@ -101,23 +105,11 @@ void testProcIterable() throws Exception {
             (Proc<Integer>) list::add,
             new IterableOf<>(1, 2, 3, 4)
         ).value();
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "proc iterable should collect list",
             list,
             Matchers.contains(1, 2, 3, 4)
-        );
-    }
-
-    @Test
-    void testProcIterator() throws Exception {
-        final List<Integer> list = new LinkedList<>();
-        new Or(
-            (Proc<Integer>) list::add,
-            new IterableOf<>(1, 2, 3, 4)
-        ).value();
-        MatcherAssert.assertThat(
-            list,
-            Matchers.contains(1, 2, 3, 4)
-        );
+        ).affirm();
     }
 
     @Test
@@ -127,48 +119,40 @@ void testProcVarargs() throws Exception {
             (Proc<Integer>) list::add,
             2, 3, 4
         ).value();
-        MatcherAssert.assertThat(
+        new Assertion<>(
+            "proc iterable should collect list from varargs",
             list,
             Matchers.contains(2, 3, 4)
-        );
-    }
-
-    @Test
-    void testFuncIterable() throws Exception {
-        MatcherAssert.assertThat(
-            new Or(
-                input -> input > 0,
-                new IterableOf<>(-1, 1, 0)
-            ),
-            new HasValue<>(true)
-        );
+        ).affirm();
     }
 
     @Test
-    void testFuncIterator() throws Exception {
-        MatcherAssert.assertThat(
+    void testFuncIterable() {
+        new Assertion<>(
+            "function should be called for iterable",
             new Or(
                 input -> input > 0,
                 new IterableOf<>(-1, 1, 0)
             ),
             new HasValue<>(true)
-        );
+        ).affirm();
     }
 
     @Test
-    void testFuncVarargs() throws Exception {
-        MatcherAssert.assertThat(
+    void testFuncVarargs() {
+        new Assertion<>(
+            "function should be called for varargs",
             new Or(
                 input -> input > 0,
                 -1, -2, 0
             ),
             new HasValue<>(false)
-        );
+        ).affirm();
     }
 
     @Test
-    void testMultipleFuncConditionTrue() throws Exception {
-        MatcherAssert.assertThat(
+    void testMultipleFuncConditionTrue() {
+        new Assertion<>(
             "Can't compare subject with true conditions",
             new Or(
                 3,
@@ -177,12 +161,12 @@ void testMultipleFuncConditionTrue() throws Exception {
                 input -> input > 4
             ),
             new HasValue<>(true)
-        );
+        ).affirm();
     }
 
     @Test
-    void testMultipleFuncConditionFalse() throws Exception {
-        MatcherAssert.assertThat(
+    void testMultipleFuncConditionFalse() {
+        new Assertion<>(
             "Can't compare subject with false conditions",
             new Or(
                 "cactoos",
@@ -190,6 +174,6 @@ void testMultipleFuncConditionFalse() throws Exception {
                 input -> input.contains("static")
             ),
             new HasValue<>(false)
-        );
+        ).affirm();
     }
 }
diff --git a/src/test/java/org/cactoos/scalar/RetryTest.java b/src/test/java/org/cactoos/scalar/RetryTest.java
index cb48f91c8..f04eaaa61 100644
--- a/src/test/java/org/cactoos/scalar/RetryTest.java
+++ b/src/test/java/org/cactoos/scalar/RetryTest.java
@@ -73,7 +73,7 @@ void runsScalarTwiceWithDefaults() {
                     return 0;
                 }
             ),
-           new HasValue<>(0)
+            new HasValue<>(0)
         ).affirm();
     }
 
diff --git a/src/test/java/org/cactoos/text/FormattedTextTest.java b/src/test/java/org/cactoos/text/FormattedTextTest.java
index ae0d01a98..ed18cac2c 100644
--- a/src/test/java/org/cactoos/text/FormattedTextTest.java
+++ b/src/test/java/org/cactoos/text/FormattedTextTest.java
@@ -60,7 +60,7 @@ void formatsTextWithObjects() {
             new FormattedText(
                 new TextOf("%d. Number as %s"),
                 1,
-                new String("string")
+                "string"
             ),
             new HasString("1. Number as string")
         ).affirm();
diff --git a/src/test/java/org/cactoos/text/TextOfTest.java b/src/test/java/org/cactoos/text/TextOfTest.java
index 86738f8f7..2afb8f042 100644
--- a/src/test/java/org/cactoos/text/TextOfTest.java
+++ b/src/test/java/org/cactoos/text/TextOfTest.java
@@ -166,7 +166,7 @@ void readsEncodedArrayOfCharsIntoText() {
 
     @Test
     void readsAnArrayOfBytes() {
-        final byte[] bytes = new byte[]{(byte) 0xCA, (byte) 0xFE};
+        final byte[] bytes = {(byte) 0xCA, (byte) 0xFE};
         new Assertion<>(
             "Can't read array of bytes",
             new TextOf(