diff --git a/java-puzzles/.gitlab-ci.yml b/java-puzzles/.gitlab-ci.yml
index a140bf095452dcb49868587fadb455d182805ba9..61ec43e60de23fd0e66cf237780d63f9d040a863 100644
--- a/java-puzzles/.gitlab-ci.yml
+++ b/java-puzzles/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 package-java-puzzles:
   variables:
     PROJECT_FOLDER: "java-puzzles"
-  extends: .java
+  extends: .java-no-jacoco
   only:
     refs:
       - master
diff --git a/java-puzzles/src/test/java/fr/ippon/PlayingWithBigDecimal.java b/java-puzzles/src/test/java/fr/ippon/PlayingWithBigDecimal.java
index bb76436ce8dc69000e2f317ba6a7fa5fcdb7bca9..e858466ba2698acdd51d8d3b696de4cf2dbca162 100644
--- a/java-puzzles/src/test/java/fr/ippon/PlayingWithBigDecimal.java
+++ b/java-puzzles/src/test/java/fr/ippon/PlayingWithBigDecimal.java
@@ -11,8 +11,9 @@ public class PlayingWithBigDecimal {
   public void roundingSubstract() {
     BigDecimal a = new BigDecimal(2.00);
     BigDecimal b = new BigDecimal(0.99);
-  // assertThat(a.subtract(b).toString()).isEqualTo("1");
-  // assertThat(a.subtract(b).toString()).isEqualTo("1.01");
-  // assertThat(a.subtract(b).toString()).isEqualTo("1.0100000000000000088817841970012523233890533447265625");
+
+    // assertThat(a.subtract(b).toString()).isEqualTo("1");
+    // assertThat(a.subtract(b).toString()).isEqualTo("1.01");
+    assertThat(a.subtract(b).toString()).isEqualTo("1.0100000000000000088817841970012523233890533447265625");
   }
 }
diff --git a/java-puzzles/src/test/java/fr/ippon/PlayingWithFinally.java b/java-puzzles/src/test/java/fr/ippon/PlayingWithFinally.java
index 2e62acf41334410e60a291ba60d1a681d99707db..a223a849ec0029ee07d24c63e1e1048df72d086d 100644
--- a/java-puzzles/src/test/java/fr/ippon/PlayingWithFinally.java
+++ b/java-puzzles/src/test/java/fr/ippon/PlayingWithFinally.java
@@ -9,7 +9,7 @@ public class PlayingWithFinally {
   @Test
   public void playingWithReturn() {
     // assertThat(finallyReturn()).isEqualTo(42);
-  // assertThat(finallyReturn()).isEqualTo(1337);
+    assertThat(finallyReturn()).isEqualTo(1337);
   }
 
   @SuppressWarnings("finally")
@@ -24,9 +24,7 @@ public class PlayingWithFinally {
   @Test
   public void playingWithThrow() {
     // assertThat(finallyThrow()).isEqualTo(42);
-  // assertThatThrownBy(() -> finallyThrow())
-  // .isInstanceOf(IllegalArgumentException.class)
-  // .hasMessageContaining("Damned");
+    assertThatThrownBy(() -> finallyThrow()).isInstanceOf(IllegalArgumentException.class).hasMessageContaining("Damned");
   }
 
   @SuppressWarnings("finally")
diff --git a/java-puzzles/src/test/java/fr/ippon/PlayingWithInstanciations.java b/java-puzzles/src/test/java/fr/ippon/PlayingWithInstanciations.java
index 34c32f54c7ebee414dc6d88c2838813a5f66b2ef..6cda1b98a9687c89d9c0a0899a427eb77013b56d 100644
--- a/java-puzzles/src/test/java/fr/ippon/PlayingWithInstanciations.java
+++ b/java-puzzles/src/test/java/fr/ippon/PlayingWithInstanciations.java
@@ -13,9 +13,9 @@ public class PlayingWithInstanciations {
     long start = System.currentTimeMillis();
 
     // assertThat(start).isLessThanOrEqualTo(instanciation);
-    // assertThat(start).isGreaterThan(instanciation);
+    assertThat(start).isGreaterThan(instanciation);
     MyPrivateClass.doStuff();
-  // assertThat(start).isLessThanOrEqualTo(MyPrivateClass.instanciation);
+    assertThat(start).isLessThanOrEqualTo(MyPrivateClass.instanciation);
   // assertThat(start).isGreaterThan(MyPrivateClass.instanciation);
   }
 
diff --git a/java-puzzles/src/test/java/fr/ippon/PlayingWithInteger.java b/java-puzzles/src/test/java/fr/ippon/PlayingWithInteger.java
index 547c56703108f0050f8977e79802f28dd5eac8e1..7c5b4c5e8504993a7e695cddeabb53bd32c3b4a5 100644
--- a/java-puzzles/src/test/java/fr/ippon/PlayingWithInteger.java
+++ b/java-puzzles/src/test/java/fr/ippon/PlayingWithInteger.java
@@ -10,7 +10,8 @@ public class PlayingWithInteger {
   public void comparingUniversaleAnswerIntegerReferences() {
     Integer a = 42;
     Integer b = 42;
-  // assertThat(a).isSameAs(b);
+
+    assertThat(a).isSameAs(b);
   // assertThat(a).isNotSameAs(b);
   }
 
@@ -18,14 +19,14 @@ public class PlayingWithInteger {
   public void comparingDevilIntegerReferences() {
     Integer a = 666;
     Integer b = 666;
-  // assertThat(a).isSameAs(b);
-  // assertThat(a).isNotSameAs(b);
+
+    // assertThat(a).isSameAs(b);
+    assertThat(a).isNotSameAs(b);
   }
 
   @Test
   public void checkingAbsoluteValue() {
     // assertThat(Math.abs(Integer.MIN_VALUE)).isEqualTo(Integer.MAX_VALUE);
-  // assertThat(Math.abs(Integer.MIN_VALUE))
-  // .isEqualTo(Integer.MIN_VALUE);
+    assertThat(Math.abs(Integer.MIN_VALUE)).isEqualTo(Integer.MIN_VALUE);
   }
 }
diff --git a/java-puzzles/src/test/java/fr/ippon/PlayingWithString.java b/java-puzzles/src/test/java/fr/ippon/PlayingWithString.java
index 1210d5b90d52136e9ffd4ff139e88e0fd5d55d0f..4a5a8676d8a80b57820363d9736de7f535a27b45 100644
--- a/java-puzzles/src/test/java/fr/ippon/PlayingWithString.java
+++ b/java-puzzles/src/test/java/fr/ippon/PlayingWithString.java
@@ -8,20 +8,19 @@ public class PlayingWithString {
 
   @Test
   public void playingWithReferences() {
-    // assertThat("coucou").isSameAs("coucou");
+    assertThat("coucou").isSameAs("coucou");
   // assertThat("coucou").isNotSameAs("coucou");
   }
 
   @Test
   public void playingWithStringObjectsReferences() {
     // assertThat(new String("coucou")).isSameAs(new String("coucou"));
-  // assertThat(new String("coucou")).isNotSameAs(new String("coucou"));
+    assertThat(new String("coucou")).isNotSameAs(new String("coucou"));
   }
 
   @Test
   public void playingWithIntern() {
-    // assertThat(new String("coucou").intern())
-  // .isSameAs(new String("coucou").intern());
+    assertThat(new String("coucou").intern()).isSameAs(new String("coucou").intern());
   // assertThat(new String("coucou").intern()).isNotSameAs(new
   // String("coucou").intern());
   }
diff --git a/java-puzzles/src/test/java/fr/ippon/PlayingWithThreads.java b/java-puzzles/src/test/java/fr/ippon/PlayingWithThreads.java
index 559432d2dfaf29900e8cfa547b819ea74e3de31b..c80e745c6a25f9d3159b46e795da6dea03860153 100644
--- a/java-puzzles/src/test/java/fr/ippon/PlayingWithThreads.java
+++ b/java-puzzles/src/test/java/fr/ippon/PlayingWithThreads.java
@@ -26,11 +26,11 @@ public class PlayingWithThreads {
     Set<Integer> days = Collections.newSetFromMap(new ConcurrentHashMap<>());
     ExecutorService executor = Executors.newFixedThreadPool(10);
 
+    SimpleDateFormat format = new SimpleDateFormat("dd");
     AtomicInteger counter = new AtomicInteger(1);
     for (int i = 1; i < 32; ++i) {
       executor.submit(
         () -> {
-          SimpleDateFormat format = new SimpleDateFormat("dd");
           Date date = new GregorianCalendar(2018, Calendar.JANUARY, counter.getAndIncrement()).getTime();
           days.add(Integer.parseInt(format.format(date)));
         }
@@ -39,8 +39,9 @@ public class PlayingWithThreads {
 
     executor.shutdown();
     executor.awaitTermination(3, TimeUnit.SECONDS);
-  // assertThat(days).hasSize(31);
-  // assertThat(days.size()).isLessThan(31);
+
+    // assertThat(days).hasSize(31);
+    assertThat(days.size()).isLessThan(31);
   }
 
   @Test
@@ -61,7 +62,7 @@ public class PlayingWithThreads {
     threadDoneFlag = true;
 
     Thread.sleep(50);
-  // assertThat(threadStopped.get()).isFalse();
+    assertThat(threadStopped.get()).isFalse();
   // assertThat(threadStopped.get()).isTrue();
   }
 
@@ -85,8 +86,9 @@ public class PlayingWithThreads {
     threadDoneFlag = true;
 
     Thread.sleep(50);
-  // assertThat(threadStopped.get()).isFalse();
-  // assertThat(threadStopped.get()).isTrue();
+
+    // assertThat(threadStopped.get()).isFalse();
+    assertThat(threadStopped.get()).isTrue();
   }
 
   @Test
@@ -107,7 +109,8 @@ public class PlayingWithThreads {
     threadDoneAtomicFlag.set(true);
 
     Thread.sleep(50);
-  // assertThat(threadStopped.get()).isFalse();
-  // assertThat(threadStopped.get()).isTrue();
+
+    // assertThat(threadStopped.get()).isFalse();
+    assertThat(threadStopped.get()).isTrue();
   }
 }