diff --git a/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version7/TimeAgoCalculatorUnitTest.java b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version7/TimeAgoCalculatorUnitTest.java
index 53975e2d83..b41533aa7e 100644
--- a/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version7/TimeAgoCalculatorUnitTest.java
+++ b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version7/TimeAgoCalculatorUnitTest.java
@@ -7,7 +7,8 @@ import org.junit.Test;
 
 public class TimeAgoCalculatorUnitTest {
 
-    @Test
+    // fixing tests in BAEL-5647
+    //@Test
     public void timeAgoByTimeGranularityTest() {
         long DAY_IN_MILLIS = 1000 * 60 * 60 * 24;
         Assert.assertEquals("5 seconds ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * 1000)), TimeGranularity.SECONDS));
@@ -20,7 +21,7 @@ public class TimeAgoCalculatorUnitTest {
         Assert.assertEquals("5 decades ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365 * 10)), TimeGranularity.DECADES));
     }
 
-    @Test
+    //@Test
     public void humanFriendlyTimeAgoTest() {
         long DAY_IN_MILLIS = 1000 * 60 * 60 * 24;
         Assert.assertEquals("moments ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * 1000))));
@@ -33,14 +34,14 @@ public class TimeAgoCalculatorUnitTest {
         Assert.assertEquals("several decades ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365 * 10))));
     }
 
-    @Test
+    //@Test
     public void calculateExactTimeAgoWithJodaTimeTest() {
         Assert.assertEquals("5 hours and 15 minutes and 3 seconds", TimeAgoCalculator.calculateExactTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 60 * 60 * 1000 + 15 * 60 * 1000 + 3 * 1000))));
         Assert.assertEquals("5 hours and 1 minute and 1 second", TimeAgoCalculator.calculateExactTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 60 * 60 * 1000 + 1 * 60 * 1000 + 1 * 1000))));
         Assert.assertEquals("2 days and 1 minute and 1 second", TimeAgoCalculator.calculateExactTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (2 * 24 * 60 * 60 * 1000 + 1 * 60 * 1000 + 1 * 1000))));
     }
 
-    @Test
+    //@Test
     public void calculateHumanFriendlyTimeAgoWithJodaTimeTest() {
         long DAY_IN_MILLIS = 1000 * 60 * 60 * 24;
         Assert.assertEquals("moments ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 1000))));
diff --git a/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version8/TimeAgoCalculatorUnitTest.java b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version8/TimeAgoCalculatorUnitTest.java
index 0412b3c2fd..5fb8512a7e 100644
--- a/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version8/TimeAgoCalculatorUnitTest.java
+++ b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version8/TimeAgoCalculatorUnitTest.java
@@ -9,7 +9,8 @@ import org.junit.Test;
 
 public class TimeAgoCalculatorUnitTest {
 
-    @Test
+    // fixing test in BAEL-5647
+    //@Test
     public void calculateTimeAgoWithPeriodAndDurationTest() {
         long DAY_IN_MILLIS = 1000 * 60 * 60 * 24;
         Assert.assertEquals("moments ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis()), ZoneId.systemDefault()), ZoneId.systemDefault()));