diff --git a/test/groovy/CommonStepsTest.groovy b/test/groovy/CommonStepsTest.groovy
index aca11b1fb..0ed0575ab 100644
--- a/test/groovy/CommonStepsTest.groovy
+++ b/test/groovy/CommonStepsTest.groovy
@@ -4,6 +4,7 @@ import static org.hamcrest.Matchers.equalTo
 import static org.hamcrest.Matchers.is
 import static org.junit.Assert.assertThat
 import static org.junit.Assert.fail
+import static util.StepHelper.getSteps
 
 import java.io.File;
 import java.util.stream.Collectors
@@ -241,11 +242,4 @@ public class CommonStepsTest extends BasePiperTest{
         assertThat("Steps with call methods with return types other than void: ${stepsWithCallMethodsOtherThanVoid}",
             stepsWithCallMethodsOtherThanVoid, is(empty()))
     }
-
-    private static getSteps() {
-        List steps = []
-        new File('vars').traverse(type: FileType.FILES, maxDepth: 0)
-            { if(it.getName().endsWith('.groovy')) steps << (it =~ /vars[\\\/](.*)\.groovy/)[0][1] }
-        return steps
-    }
 }
diff --git a/test/groovy/util/StepHelper.groovy b/test/groovy/util/StepHelper.groovy
new file mode 100644
index 000000000..59fb311e5
--- /dev/null
+++ b/test/groovy/util/StepHelper.groovy
@@ -0,0 +1,15 @@
+package util;
+
+import java.util.List;
+
+import groovy.io.FileType
+
+public class StepHelper {
+
+    private static getSteps() {
+        List steps = []
+        new File('vars').traverse(type: FileType.FILES, maxDepth: 0)
+            { if(it.getName().endsWith('.groovy')) steps << (it =~ /vars[\\\/](.*)\.groovy/)[0][1] }
+        return steps
+    }
+}