diff --git a/core-java-8/src/test/java/com/baeldung/util/CurrentDateTimeTest.java b/core-java-8/src/test/java/com/baeldung/util/CurrentDateTimeTest.java
index 06d9394a5e..599d5a5894 100644
--- a/core-java-8/src/test/java/com/baeldung/util/CurrentDateTimeTest.java
+++ b/core-java-8/src/test/java/com/baeldung/util/CurrentDateTimeTest.java
@@ -1,47 +1,57 @@
 package com.baeldung.util;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
 
+import java.time.Clock;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalTime;
+import java.time.ZoneId;
 import java.time.temporal.ChronoField;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 public class CurrentDateTimeTest {
 
+    private static Clock clock;
+
+    @BeforeClass
+    public static void setup() {
+        final Instant currentTime = Instant.parse("2016-10-09T15:10:30.00Z");
+
+        clock = Mockito.mock(Clock.class);
+        when(clock.instant()).thenAnswer((invocation) -> currentTime);
+        when(clock.getZone()).thenAnswer((invocation) -> ZoneId.of("UTC"));
+    }
+
     @Test
     public void shouldReturnCurrentDate() {
 
-        final LocalDate now = LocalDate.now();
-        final Calendar calendar = GregorianCalendar.getInstance();
+        final LocalDate now = LocalDate.now(clock);
 
-        assertEquals("10-10-2010".length(), now.toString().length());
-        assertEquals(calendar.get(Calendar.DATE), now.get(ChronoField.DAY_OF_MONTH));
-        assertEquals(calendar.get(Calendar.MONTH), now.get(ChronoField.MONTH_OF_YEAR) - 1);
-        assertEquals(calendar.get(Calendar.YEAR), now.get(ChronoField.YEAR));
+        assertEquals(9, now.get(ChronoField.DAY_OF_MONTH));
+        assertEquals(10, now.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(2016, now.get(ChronoField.YEAR));
     }
 
     @Test
     public void shouldReturnCurrentTime() {
 
-        final LocalTime now = LocalTime.now();
-        final Calendar calendar = GregorianCalendar.getInstance();
+        final LocalTime now = LocalTime.now(clock);
 
-        assertEquals(calendar.get(Calendar.HOUR_OF_DAY), now.get(ChronoField.HOUR_OF_DAY));
-        assertEquals(calendar.get(Calendar.MINUTE), now.get(ChronoField.MINUTE_OF_HOUR));
-        assertEquals(calendar.get(Calendar.SECOND), now.get(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(15, now.get(ChronoField.HOUR_OF_DAY));
+        assertEquals(10, now.get(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(30, now.get(ChronoField.SECOND_OF_MINUTE));
     }
 
     @Test
     public void shouldReturnCurrentTimestamp() {
 
-        final Instant now = Instant.now();
-        final Calendar calendar = GregorianCalendar.getInstance();
+        final Instant now = Instant.now(clock);
 
-        assertEquals(calendar.getTimeInMillis() / 1000, now.getEpochSecond());
+        assertEquals(clock.instant().getEpochSecond(), now.getEpochSecond());
     }
 }