diff --git a/pom.xml b/pom.xml
index 36abc15..8294d57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,9 +236,6 @@
                     <settingsFile>src/it/settings.xml</settingsFile>
                     <localRepositoryPath>${it.local.repo}</localRepositoryPath>
                     <postBuildHookScript>verify</postBuildHookScript>
-                    <setupIncludes>
-                        <setupInclude>setup-*</setupInclude>
-                    </setupIncludes>
                     <pomIncludes>
                         <pomInclude>*</pomInclude>
                     </pomIncludes>
diff --git a/src/it/maven-repo-jdk/invoker.properties b/src/it/maven-repo-jdk/invoker.properties
index 5a377f4..22270ef 100644
--- a/src/it/maven-repo-jdk/invoker.properties
+++ b/src/it/maven-repo-jdk/invoker.properties
@@ -35,4 +35,7 @@ invoker.goals.19=install:install-file -Dclassifier=macos-aarch64 -Dfile=src/jdka
 #Install JDK from archive in local repo
 invoker.goals.20=clean verify
 
+#Run second last - the galah vendor JDK, if left there, can interfere with other tests looking for plain JDK 17
+invoker.ordinal=-50
+
 #The verify script will check that the fake JDK was actually grabbed from the local repo
diff --git a/src/it/setup-clean-galah-jdks/invoker.properties b/src/it/setup-clean-galah-jdks/invoker.properties
deleted file mode 100644
index 6894491..0000000
--- a/src/it/setup-clean-galah-jdks/invoker.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-invoker.mavenOpts=-Dautojdk.purge.version=[17,18) -Dautojdk.purge.vendor=galah-vendor -Dautojdk.purge.caches=true
-invoker.goals=${project.groupId}:${project.artifactId}:${project.version}:purge-jdks