diff --git a/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/BasicExtensions.groovy b/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/BasicExtensions.groovy
index 65591cae8d..0612ecb955 100644
--- a/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/BasicExtensions.groovy
+++ b/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/BasicExtensions.groovy
@@ -2,10 +2,13 @@ package com.baeldung.metaprogramming.extension
 
 import com.baeldung.metaprogramming.Employee
 
+import java.time.LocalDate
+import java.time.Year
+
 class BasicExtensions {
     
     static int getYearOfBirth(Employee self) {
-        return (new Date().getYear() + 1900) - self.age;
+        return Year.now().value - self.age
     }
     
     static String capitalize(String self) {
diff --git a/core-groovy-2/src/test/groovy/com/baeldung/metaprogramming/MetaprogrammingUnitTest.groovy b/core-groovy-2/src/test/groovy/com/baeldung/metaprogramming/MetaprogrammingUnitTest.groovy
index 780b88cbbf..4a8631eb95 100644
--- a/core-groovy-2/src/test/groovy/com/baeldung/metaprogramming/MetaprogrammingUnitTest.groovy
+++ b/core-groovy-2/src/test/groovy/com/baeldung/metaprogramming/MetaprogrammingUnitTest.groovy
@@ -1,6 +1,9 @@
 package com.baeldung.metaprogramming
 
-import groovy.time.TimeCategory
+
+import java.time.LocalDate
+import java.time.Period
+import java.time.Year
 
 class MetaprogrammingUnitTest extends GroovyTestCase {
 
@@ -51,14 +54,16 @@ class MetaprogrammingUnitTest extends GroovyTestCase {
 
     void testJavaMetaClass() {
         String.metaClass.capitalize = { String str ->
-            str.substring(0, 1).toUpperCase() + str.substring(1);
+            str.substring(0, 1).toUpperCase() + str.substring(1)
         }
         assert "norman".capitalize() == "Norman"
     }
 
     void testEmployeeExtension() {
-        Employee emp = new Employee(age: 28)
-        assert emp.getYearOfBirth() == 1992
+        def age = 28
+        def expectedYearOfBirth = Year.now() - age
+        Employee emp = new Employee(age: age)
+        assert emp.getYearOfBirth() == expectedYearOfBirth.value
     }
 
     void testJavaClassesExtensions() {