diff --git a/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java b/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java
index 54144288..df408ac4 100644
--- a/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java
+++ b/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java
@@ -11,7 +11,7 @@
  * This plugin validates that every plugin has a corresponding .properties file.
  *
  * <ul>
- *     <li>Adds 'validatePlugins' task of type {@link PluginValidatorTask}.
+ *     <li>Adds 'validatePluginsShipkit' task of type {@link PluginValidatorTask}.
  *          Validates that every plugin has a corresponding .properties file.
  *          New task is configured as dependency of 'check' task so that when you run 'check', the plugins are validated
  *          </li>
@@ -19,7 +19,7 @@
  */
 public class PluginValidationPlugin implements Plugin<Project> {
 
-    static final String VALIDATE_PLUGINS = "validatePlugins";
+    static final String VALIDATE_PLUGINS = "validatePluginsSkipkit";
 
     @Override
     public void apply(final Project project) {
diff --git a/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy b/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy
index 5e7c54a7..4a8edb9e 100644
--- a/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy
+++ b/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy
@@ -58,7 +58,6 @@ class ShipkitJavaIntegTest extends GradleSpecification {
 :updateReleaseNotes
 :gitCommit
 :gitTag
-:api:generatePomFileForJavaLibraryPublication
 :api:compileJava
 :api:processResources
 :api:classes
@@ -68,7 +67,6 @@ class ShipkitJavaIntegTest extends GradleSpecification {
 :api:createDependencyInfoFile
 :api:sourcesJar
 :api:publishJavaLibraryPublicationToMavenLocal
-:impl:generatePomFileForJavaLibraryPublication
 :impl:compileJava
 :impl:processResources
 :impl:classes
diff --git a/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavadocIntegTest.groovy b/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavadocIntegTest.groovy
index 133f3583..384290a2 100644
--- a/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavadocIntegTest.groovy
+++ b/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavadocIntegTest.groovy
@@ -49,7 +49,6 @@ class ShipkitJavadocIntegTest extends GradleSpecification {
 :updateReleaseNotes
 :gitCommit
 :gitTag
-:api:generatePomFileForJavaLibraryPublication
 :api:compileJava
 :api:processResources
 :api:classes
@@ -59,7 +58,6 @@ class ShipkitJavadocIntegTest extends GradleSpecification {
 :api:createDependencyInfoFile
 :api:sourcesJar
 :api:publishJavaLibraryPublicationToMavenLocal
-:impl:generatePomFileForJavaLibraryPublication
 :impl:compileJava
 :impl:processResources
 :impl:classes
@@ -137,7 +135,6 @@ class ShipkitJavadocIntegTest extends GradleSpecification {
 :updateReleaseNotes
 :gitCommit
 :gitTag
-:api:generatePomFileForJavaLibraryPublication
 :api:compileJava
 :api:processResources
 :api:classes
@@ -147,7 +144,6 @@ class ShipkitJavadocIntegTest extends GradleSpecification {
 :api:createDependencyInfoFile
 :api:sourcesJar
 :api:publishJavaLibraryPublicationToMavenLocal
-:impl:generatePomFileForJavaLibraryPublication
 :impl:compileJava
 :impl:processResources
 :impl:classes
diff --git a/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy b/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy
index 03c722f4..f6aa2fb4 100644
--- a/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy
+++ b/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy
@@ -132,7 +132,11 @@ abstract class GradleSpecification extends Specification implements GradleVersio
 
     protected List<String> skippedTaskPathsGradleBugWorkaround(String output) {
         //Due to https://github.com/gradle/gradle/issues/2732 no tasks are returned in dry-run mode. When fixed ".taskPaths(SKIPPED)" should be used directly
-        return output.readLines().findAll { it.endsWith(" SKIPPED") }.collect { it.substring(0, it.lastIndexOf(" ")) }
+        return output.readLines()
+            .findAll { it.endsWith(" SKIPPED") }
+            .findAll { !it.contains(":generatePom") }
+            .findAll { !it.contains(":generateMetadata") }
+            .collect { it.substring(0, it.lastIndexOf(" ")) }
     }
 
     private static String findClassesDir() {
diff --git a/subprojects/shipkit/src/test/groovy/testutil/GradleVersionsDeterminer.groovy b/subprojects/shipkit/src/test/groovy/testutil/GradleVersionsDeterminer.groovy
index 1d41ff7a..6f90635b 100644
--- a/subprojects/shipkit/src/test/groovy/testutil/GradleVersionsDeterminer.groovy
+++ b/subprojects/shipkit/src/test/groovy/testutil/GradleVersionsDeterminer.groovy
@@ -24,7 +24,7 @@ trait GradleVersionsDeterminer {
             case null:
                 return [currentGradleVersion()]
             case QUICK_GRADLE_VERSIONS_VALUE:
-                return [currentGradleVersion(), "5.6", "5.0", "4.10.3", "4.0.2"].unique()
+                return [currentGradleVersion(), "6.5", "5.6", "5.0", "4.10.3", "4.0.2"].unique()
             default:
                 log.warn("Unsupported $REGRESSION_TESTS_ENV_NAME value '$regressionTestsLevel' (expected '$CURRENT_GRADLE_VERSION_ONLY_VALUE' or " +
                     "'$QUICK_GRADLE_VERSIONS_VALUE'). Assuming '$CURRENT_GRADLE_VERSION_ONLY_VALUE'.")