diff --git a/core-java/src/test/java/com/baeldung/leapyear/LeapYearUnitTest.java b/core-java/src/test/java/com/baeldung/leapyear/LeapYearUnitTest.java
new file mode 100644
index 0000000000..9fb3d03838
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/leapyear/LeapYearUnitTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.leapyear;
+
+import java.time.Year;
+import java.util.GregorianCalendar;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class LeapYearUnitTest {
+	
+	//Before Java8
+	@Test
+	public void testLeapYearUsingGregorianCalendar () {
+		Assert.assertFalse(new GregorianCalendar().isLeapYear(2018));
+	}
+	
+	//Java 8 and above
+	@Test
+	public void testLeapYearUsingJavaTimeYear () {
+		Assert.assertTrue(Year.isLeap(2012));
+	}
+	
+	@Test
+	public void testBCYearUsingJavaTimeYear () {
+		Assert.assertTrue(Year.isLeap(-4));
+	}
+	
+	@Test
+	public void testWrongLeapYearUsingJavaTimeYear () {
+		Assert.assertFalse(Year.isLeap(2018));
+	}
+	
+	@Test
+	public void testLeapYearInDateUsingJavaTimeYear () {
+		LocalDate date = LocalDate.parse("2020-01-05", DateTimeFormatter.ISO_LOCAL_DATE);
+		Assert.assertTrue(Year.from(date).isLeap());
+	}
+	
+}