diff --git a/pitest-entry/src/main/java/org/pitest/mutationtest/build/intercept/equivalent/EquivalentReturnMutationFilter.java b/pitest-entry/src/main/java/org/pitest/mutationtest/build/intercept/equivalent/EquivalentReturnMutationFilter.java
index f117af6a2..6ca5e6d53 100644
--- a/pitest-entry/src/main/java/org/pitest/mutationtest/build/intercept/equivalent/EquivalentReturnMutationFilter.java
+++ b/pitest-entry/src/main/java/org/pitest/mutationtest/build/intercept/equivalent/EquivalentReturnMutationFilter.java
@@ -111,6 +111,7 @@ private static Match<AbstractInsnNode> loadsEmptyReturnOntoStack() {
             .or(noArgsCall("java/util/Collections", "emptyList"))
             .or(noArgsCall("java/util/Collections", "emptyMap"))
             .or(noArgsCall("java/util/Collections", "emptySet"))
+            .or(noArgsCall("java/util/Map", "of"))
             .or(noArgsCall("java/util/List", "of"))
             .or(noArgsCall("java/util/Set", "of"));
   }
diff --git a/pitest-modern-verification/pom.xml b/pitest-modern-verification/pom.xml
new file mode 100644
index 000000000..8d0919a84
--- /dev/null
+++ b/pitest-modern-verification/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>pitest-parent</artifactId>
+		<groupId>org.pitest</groupId>
+		<version>${revision}</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>pitest-modern-verification</artifactId>
+	<description>Checks pitest against latest support version of java</description>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>            
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<release>17</release>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	    <dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.pitest</groupId>
+			<artifactId>pitest-entry</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.pitest</groupId>
+			<artifactId>pitest-entry</artifactId>
+			<type>test-jar</type>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.pitest</groupId>
+			<artifactId>pitest</artifactId>
+			<type>test-jar</type>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+</project>
diff --git a/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/EquivalentReturnMutationFilterTest.java b/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/EquivalentReturnMutationFilterTest.java
new file mode 100644
index 000000000..3d7e2a998
--- /dev/null
+++ b/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/EquivalentReturnMutationFilterTest.java
@@ -0,0 +1,51 @@
+package org.pitest.filters.verification.equivalent;
+
+import org.junit.Test;
+import org.pitest.mutationtest.build.intercept.equivalent.EquivalentReturnMutationFilter;
+import org.pitest.verifier.interceptors.InterceptorVerifier;
+import org.pitest.verifier.interceptors.VerifierStart;
+
+import static org.pitest.mutationtest.engine.gregor.mutators.returns.EmptyObjectReturnValsMutator.EMPTY_RETURNS;
+
+
+public class EquivalentReturnMutationFilterTest {
+
+    InterceptorVerifier v = VerifierStart.forInterceptorFactory(new EquivalentReturnMutationFilter());
+
+    @Test
+    public void filtersWhenMapOfHasNoArgs() {
+        v.usingMutator(EMPTY_RETURNS)
+                .forClass(HasMapOf.class)
+                .forAnyCode()
+                .allMutantsAreFiltered()
+                .verify();
+    }
+
+    @Test
+    public void filtersWhenSetOfHasNoArgs() {
+        v.usingMutator(EMPTY_RETURNS)
+                .forClass(HasSetOf.class)
+                .forAnyCode()
+                .allMutantsAreFiltered()
+                .verify();
+    }
+
+    @Test
+    public void filtersWhenListOfHasNoArgs() {
+        v.usingMutator(EMPTY_RETURNS)
+                .forClass(HasListOf.class)
+                .forAnyCode()
+                .allMutantsAreFiltered()
+                .verify();
+    }
+
+    @Test
+    public void doesNotFilterNonEmptyMapOf() {
+        v.usingMutator(EMPTY_RETURNS)
+                .forClass(NonEmptyMapOf.class)
+                .forAnyCode()
+                .noMutantsAreFiltered()
+                .verify();
+    }
+
+}
diff --git a/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/HasListOf.java b/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/HasListOf.java
new file mode 100644
index 000000000..2521b74a9
--- /dev/null
+++ b/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/HasListOf.java
@@ -0,0 +1,9 @@
+package org.pitest.filters.verification.equivalent;
+
+import java.util.List;
+
+public class HasListOf {
+    public List<String> mutateMe() {
+        return List.of();
+    }
+}
\ No newline at end of file
diff --git a/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/HasMapOf.java b/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/HasMapOf.java
new file mode 100644
index 000000000..94d22fb5b
--- /dev/null
+++ b/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/HasMapOf.java
@@ -0,0 +1,10 @@
+package org.pitest.filters.verification.equivalent;
+
+import java.util.Map;
+
+public class HasMapOf {
+
+    public Map<String,String> mutateMe() {
+        return Map.of();
+    }
+}
diff --git a/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/HasSetOf.java b/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/HasSetOf.java
new file mode 100644
index 000000000..8cb2e9d91
--- /dev/null
+++ b/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/HasSetOf.java
@@ -0,0 +1,9 @@
+package org.pitest.filters.verification.equivalent;
+
+import java.util.Set;
+
+public class HasSetOf {
+    public Set<String> mutateMe() {
+        return Set.of();
+    }
+}
diff --git a/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/NonEmptyMapOf.java b/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/NonEmptyMapOf.java
new file mode 100644
index 000000000..3ca7bc6c7
--- /dev/null
+++ b/pitest-modern-verification/src/test/java/org/pitest/filters/verification/equivalent/NonEmptyMapOf.java
@@ -0,0 +1,9 @@
+package org.pitest.filters.verification.equivalent;
+
+import java.util.Map;
+
+public class NonEmptyMapOf {
+    public Map<String,String> mutateMe() {
+        return Map.of("A", "Z");
+    }
+}
diff --git a/pom.xml b/pom.xml
index 56af079b6..910b1d851 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,11 +100,23 @@
 			</activation>
 			<modules>
 				<module>pitest-java8-verification</module>
-				<module>pitest-maven-verification</module>
+                <module>pitest-maven-verification</module>
 				<!-- disabled until working with java 9+ -->
 				<!-- <module>pitest-groovy-verification</module> -->
 			</modules>
 		</profile>
+		<profile>
+			<id>verification-modern</id>
+			<activation>
+				<jdk>[17,18,19]</jdk>
+				<property>
+					<name>!skipTests</name>
+				</property>
+			</activation>
+			<modules>
+				<module>pitest-modern-verification</module>
+			</modules>
+		</profile>
 		<profile>
 			<id>release</id>
 			<activation>
@@ -259,7 +271,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.8.1</version>
+					<version>3.10.1</version>
 					<configuration>
 						<source>1.8</source>
 						<target>1.8</target>