diff --git a/spring-5/src/test/java/com/baeldung/jupiter/EnabledOnJava8.java b/spring-5/src/test/java/com/baeldung/jupiter/EnabledOnJava8.java
new file mode 100644
index 0000000000..c6d3b7ff10
--- /dev/null
+++ b/spring-5/src/test/java/com/baeldung/jupiter/EnabledOnJava8.java
@@ -0,0 +1,18 @@
+package com.baeldung.jupiter;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.test.context.junit.jupiter.EnabledIf;
+
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@EnabledIf(
+    expression = "#{systemProperties['java.version'].startsWith('1.8')}",
+    reason = "Enabled on Java 8"
+)
+public @interface EnabledOnJava8 {
+
+}
diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5EnabledAnnotationTest.java b/spring-5/src/test/java/com/baeldung/jupiter/Spring5EnabledAnnotationTest.java
new file mode 100644
index 0000000000..ae058bc8ba
--- /dev/null
+++ b/spring-5/src/test/java/com/baeldung/jupiter/Spring5EnabledAnnotationTest.java
@@ -0,0 +1,50 @@
+package com.baeldung.jupiter;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.DisabledIf;
+import org.springframework.test.context.junit.jupiter.EnabledIf;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+@SpringJUnitConfig(Spring5EnabledAnnotationTest.Config.class)
+@TestPropertySource(properties = { "tests.enabled=true" })
+public class Spring5EnabledAnnotationTest {
+    
+    @Configuration
+    static class Config {
+    }
+
+    @EnabledIf("true")
+    @Test
+    void givenEnabledIfLiteral_WhenTrue_ThenTestExecuted() {
+        assertTrue(true);
+    }
+
+    @EnabledIf(expression = "${tests.enabled}", loadContext = true)
+    @Test
+    void givenEnabledIfExpression_WhenTrue_ThenTestExecuted() {
+        assertTrue(true);
+    }
+
+    @EnabledIf("#{systemProperties['java.version'].startsWith('1.8')}")
+    @Test
+    void givenEnabledIfSpel_WhenTrue_ThenTestExecuted() {
+        assertTrue(true);
+    }
+
+    @EnabledOnJava8
+    @Test
+    void givenEnabledOnJava8_WhenTrue_ThenTestExecuted() {
+        assertTrue(true);
+    }
+
+    @DisabledIf("#{systemProperties['java.version'].startsWith('1.7')}")
+    @Test
+    void givenDisabledIf_WhenTrue_ThenTestNotExecuted() {
+        assertTrue(true);
+    }
+
+}