diff --git a/core-java/src/test/java/org/baeldung/java/CoreJavaIoIntegrationTest.java b/core-java/src/test/java/org/baeldung/java/JavaIoIntegrationTest.java
similarity index 98%
rename from core-java/src/test/java/org/baeldung/java/CoreJavaIoIntegrationTest.java
rename to core-java/src/test/java/org/baeldung/java/JavaIoIntegrationTest.java
index 66cea6df43..ff92410bc4 100644
--- a/core-java/src/test/java/org/baeldung/java/CoreJavaIoIntegrationTest.java
+++ b/core-java/src/test/java/org/baeldung/java/JavaIoIntegrationTest.java
@@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory;
 import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 
-public class CoreJavaIoIntegrationTest {
+public class JavaIoIntegrationTest {
     protected final Logger logger = LoggerFactory.getLogger(getClass());
 
     // tests - iterate lines in a file
diff --git a/core-java/src/test/java/org/baeldung/java/CoreJavaRandomUnitTest.java b/core-java/src/test/java/org/baeldung/java/JavaRandomUnitTest.java
similarity index 99%
rename from core-java/src/test/java/org/baeldung/java/CoreJavaRandomUnitTest.java
rename to core-java/src/test/java/org/baeldung/java/JavaRandomUnitTest.java
index 2b688ecb10..4febe7c9fc 100644
--- a/core-java/src/test/java/org/baeldung/java/CoreJavaRandomUnitTest.java
+++ b/core-java/src/test/java/org/baeldung/java/JavaRandomUnitTest.java
@@ -7,7 +7,7 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.math3.random.RandomDataGenerator;
 import org.junit.Test;
 
-public class CoreJavaRandomUnitTest {
+public class JavaRandomUnitTest {
 
     // tests - random long
 
diff --git a/core-java/src/test/java/org/baeldung/java/JavaTimerUnitTest.java b/core-java/src/test/java/org/baeldung/java/JavaTimerUnitTest.java
new file mode 100644
index 0000000000..3bdedc81bd
--- /dev/null
+++ b/core-java/src/test/java/org/baeldung/java/JavaTimerUnitTest.java
@@ -0,0 +1,30 @@
+package org.baeldung.java;
+
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.junit.Test;
+
+public class JavaTimerUnitTest {
+
+    // tests
+
+    @Test
+    public void givenUsingTimer_whenSchedulingTaskOnce_thenCorrect() throws InterruptedException {
+        final TimerTask timerTask = new TimerTask() {
+            @Override
+            public void run() {
+                System.out.println("Task performed on " + new Date() + "\n" + "Thread's name: " + Thread.currentThread().getName());
+            }
+        };
+
+        final Timer timer = new Timer("Timer");
+        final long delay = 1000L;
+        timer.schedule(timerTask, delay);
+
+        Thread.sleep(delay * 2);
+        timer.cancel();
+    }
+
+}