diff --git a/build.gradle b/build.gradle
index d5157f7..58c8787 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,10 +28,17 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
 
     testImplementation "org.spockframework:spock-core:2.3-groovy-3.0"
+    testImplementation "org.spockframework:spock-junit4:2.3-groovy-3.0"
     testImplementation "cglib:cglib-nodep:3.3.0" //mocking concrete classes with spock
     testImplementation "org.objenesis:objenesis:3.3" //as above
 }
 
+tasks.withType(Test).configureEach { testTask ->
+    testTask.configure {
+        useJUnitPlatform()
+    }
+}
+
 apply from: "$rootDir/gradle/release.gradle"
 apply from: "$rootDir/gradle/integ-test.gradle"
 
diff --git a/src/test/groovy/org/shipkit/auto/version/AutoVersionPluginTest.groovy b/src/test/groovy/org/shipkit/auto/version/AutoVersionPluginTest.groovy
index e155cad..4a616ea 100644
--- a/src/test/groovy/org/shipkit/auto/version/AutoVersionPluginTest.groovy
+++ b/src/test/groovy/org/shipkit/auto/version/AutoVersionPluginTest.groovy
@@ -16,7 +16,7 @@ class AutoVersionPluginTest extends Specification {
         def runner = new ProcessRunner(project.projectDir)
 
         //prepare repo
-        runner.run("git", "init")
+        runner.run("git", "init", "--initial-branch=main")
         runner.run("git", "config", "user.email", "dummy@testing.com")
         runner.run("git", "config", "user.name", "Dummy For Testing")
 
@@ -29,7 +29,7 @@ class AutoVersionPluginTest extends Specification {
         runner.run("git", "commit", "--allow-empty", "-m", "PR-10 - 1")
         runner.run("git", "commit", "--allow-empty", "-m", "PR-10 - 2")
 
-        runner.run("git", "checkout", "master")
+        runner.run("git", "checkout", "main")
         runner.run("git", "merge", "PR-10", "--no-ff", "-m", "Merge pull request #10 from ...")
 
         when: