diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorParameterTest.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorParameterTest.groovy
index 87a8ea0e2..9e47404ca 100644
--- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorParameterTest.groovy
+++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorParameterTest.groovy
@@ -44,7 +44,7 @@ class SimpleRelocatorParameterTest {
 
     private static void constructThenFailOnNullPointerException(String pattern, String shadedPattern) {
         try {
-            new SimpleRelocator(pattern, shadedPattern, Collections.<String> emptyList(), Collections.<String> emptyList())
+            new SimpleRelocator(pattern, shadedPattern)
         }
         catch (NullPointerException ignored) {
             fail("Constructor should not throw null pointer exceptions")
diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorTest.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorTest.groovy
index ba04bfb51..f1488c523 100644
--- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorTest.groovy
+++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorTest.groovy
@@ -49,7 +49,7 @@ class SimpleRelocatorTest {
     void testCanRelocatePath() {
         SimpleRelocator relocator
 
-        relocator = new SimpleRelocator("org.foo", null, null, null)
+        relocator = new SimpleRelocator("org.foo", null)
         assertEquals(true, relocator.canRelocatePath("org/foo/Class"))
         assertEquals(true, relocator.canRelocatePath("org/foo/Class.class"))
         assertEquals(true, relocator.canRelocatePath("org/foo/bar/Class"))
@@ -63,8 +63,8 @@ class SimpleRelocatorTest {
         assertEquals(false, relocator.canRelocatePath("/org/Foo/Class"))
         assertEquals(false, relocator.canRelocatePath("/org/Foo/Class.class"))
 
-        relocator = new SimpleRelocator("org.foo", null, null, Arrays.asList(
-            ["org.foo.Excluded", "org.foo.public.*", "org.foo.recurse.**", "org.foo.Public*Stuff"] as String[]))
+        relocator = new SimpleRelocator("org.foo", null, null,
+            List.of("org.foo.Excluded", "org.foo.public.*", "org.foo.recurse.**", "org.foo.Public*Stuff"))
         assertEquals(true, relocator.canRelocatePath("org/foo/Class"))
         assertEquals(true, relocator.canRelocatePath("org/foo/Class.class"))
         assertEquals(true, relocator.canRelocatePath("org/foo/excluded"))
@@ -90,7 +90,7 @@ class SimpleRelocatorTest {
         assertEquals(false, relocator.canRelocatePath("org/foo/recurse/sub/Class.class"))
 
         // Verify edge cases
-        relocator = new SimpleRelocator("org.f", null, null, null)
+        relocator = new SimpleRelocator("org.f", null)
         assertEquals(false, relocator.canRelocatePath(""))       // Empty path
         assertEquals(false, relocator.canRelocatePath(".class")) // only .class
         assertEquals(false, relocator.canRelocatePath("te"))     // shorter than path pattern
@@ -115,7 +115,7 @@ class SimpleRelocatorTest {
         assertEquals(false, relocator.canRelocatePath("org/R\$string.class"))
 
         // Exclude with Regex
-        relocator = new SimpleRelocator("org.foo", null, null, null)
+        relocator = new SimpleRelocator("org.foo", null)
         relocator.exclude("%regex[org/foo/.*Factory[0-9].*]")
         assertEquals(true, relocator.canRelocatePath("org/foo/Factory.class"))
         assertEquals(true, relocator.canRelocatePath("org/foo/FooFactoryMain.class"))
@@ -126,7 +126,7 @@ class SimpleRelocatorTest {
 
         // Include with Regex and normal pattern
         relocator = new SimpleRelocator("org.foo", null,
-            Arrays.asList("%regex[org/foo/.*Factory[0-9].*]", "org.foo.public.*"), null)
+            List.of("%regex[org/foo/.*Factory[0-9].*]", "org.foo.public.*"))
         assertEquals(true, relocator.canRelocatePath("org/foo/Factory1.class"))
         assertEquals(true, relocator.canRelocatePath("org/foo/public/Bar.class"))
         assertEquals(false, relocator.canRelocatePath("org/foo/Factory.class"))
@@ -137,14 +137,14 @@ class SimpleRelocatorTest {
     void testCanRelocateClass() {
         SimpleRelocator relocator
 
-        relocator = new SimpleRelocator("org.foo", null, null, null)
+        relocator = new SimpleRelocator("org.foo", null)
         assertEquals(true, relocator.canRelocateClass("org.foo.Class"))
         assertEquals(true, relocator.canRelocateClass("org.foo.bar.Class"))
         assertEquals(false, relocator.canRelocateClass("com.foo.bar.Class"))
         assertEquals(false, relocator.canRelocateClass("org.Foo.Class"))
 
-        relocator = new SimpleRelocator("org.foo", null, null, Arrays.asList(
-            ["org.foo.Excluded", "org.foo.public.*", "org.foo.recurse.**", "org.foo.Public*Stuff"] as String[]))
+        relocator = new SimpleRelocator("org.foo", null, null,
+            List.of("org.foo.Excluded", "org.foo.public.*", "org.foo.recurse.**", "org.foo.Public*Stuff"))
         assertEquals(true, relocator.canRelocateClass("org.foo.Class"))
         assertEquals(true, relocator.canRelocateClass("org.foo.excluded"))
         assertEquals(false, relocator.canRelocateClass("org.foo.Excluded"))
@@ -176,7 +176,7 @@ class SimpleRelocatorTest {
     //MSHADE-119, make sure that the easy part of this works.
     @Test
     void testCanRelocateAbsClassPath() {
-        SimpleRelocator relocator = new SimpleRelocator("org.apache.velocity", "org.apache.momentum", null, null)
+        SimpleRelocator relocator = new SimpleRelocator("org.apache.velocity", "org.apache.momentum")
         assertEquals("/org/apache/momentum/mass.properties", relocator.relocatePath(pathContext("/org/apache/velocity/mass.properties")))
 
     }
@@ -185,10 +185,10 @@ class SimpleRelocatorTest {
     void testRelocatePath() {
         SimpleRelocator relocator
 
-        relocator = new SimpleRelocator("org.foo", null, null, null)
+        relocator = new SimpleRelocator("org.foo", null)
         assertEquals("hidden/org/foo/bar/Class.class", relocator.relocatePath(pathContext("org/foo/bar/Class.class")))
 
-        relocator = new SimpleRelocator("org.foo", "private.stuff", null, null)
+        relocator = new SimpleRelocator("org.foo", "private.stuff")
         assertEquals("private/stuff/bar/Class.class", relocator.relocatePath(pathContext("org/foo/bar/Class.class")))
     }
 
@@ -196,10 +196,10 @@ class SimpleRelocatorTest {
     void testRelocateClass() {
         SimpleRelocator relocator
 
-        relocator = new SimpleRelocator("org.foo", null, null, null)
+        relocator = new SimpleRelocator("org.foo", null)
         assertEquals("hidden.org.foo.bar.Class", relocator.relocateClass(classContext("org.foo.bar.Class")))
 
-        relocator = new SimpleRelocator("org.foo", "private.stuff", null, null)
+        relocator = new SimpleRelocator("org.foo", "private.stuff")
         assertEquals("private.stuff.bar.Class", relocator.relocateClass(classContext("org.foo.bar.Class")))
     }
 
diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformerSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformerSpec.groovy
index 016b1968c..e48aaf66a 100644
--- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformerSpec.groovy
+++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformerSpec.groovy
@@ -35,7 +35,7 @@ class Log4j2PluginsCacheFileTransformerSpec extends Specification {
     void "should transform"() {
         given:
         List<Relocator> relocators = new ArrayList<>()
-        relocators.add(new SimpleRelocator(null, null, null, null))
+        relocators.add(new SimpleRelocator(null, null))
 
         when:
         transformer.transform(new TransformerContext(PLUGIN_CACHE_FILE, getResourceStream(PLUGIN_CACHE_FILE), relocators))
@@ -49,7 +49,7 @@ class Log4j2PluginsCacheFileTransformerSpec extends Specification {
         String pattern = "org.apache.logging"
         String destination = "new.location.org.apache.logging"
 
-        List<Relocator> relocators = singletonList((Relocator) new SimpleRelocator(pattern, destination, null, null))
+        List<Relocator> relocators = singletonList((Relocator) new SimpleRelocator(pattern, destination))
 
         when:
         transformer.transform(new TransformerContext(PLUGIN_CACHE_FILE, getResourceStream(PLUGIN_CACHE_FILE), relocators, new ShadowStats()))