diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
index 22ab7fc638..c169dddf6d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
@@ -34,14 +34,15 @@ public MavenITmng5530MojoExecutionScopeTest()
     public void test_copyfiles()
         throws Exception
     {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng5530-mojo-execution-scope" );
-        File pluginDir = new File( testDir, "mng5530-mojo-execution-scope-plugin" );
-        File projectDir = new File( testDir, "mng5530-mojo-execution-scope-basic" );
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5530");
+        File pluginDir = new File( testDir, "plugin" );
+        File projectDir = new File( testDir, "basic" );
 
         Verifier verifier;
 
         // install the test plugin
         verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
+        verifier.setSystemProperty("mavenVersion", getMavenVersion());
         verifier.executeGoal( "install" );
         verifier.resetStreams();
         verifier.verifyErrorFreeLog();
diff --git a/its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-basic/pom.xml b/its/core-it-suite/src/test/resources/mng-5530/basic/pom.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-basic/pom.xml
rename to its/core-it-suite/src/test/resources/mng-5530/basic/pom.xml
diff --git a/its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-5530/plugin/pom.xml
similarity index 98%
rename from its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/pom.xml
rename to its/core-it-suite/src/test/resources/mng-5530/plugin/pom.xml
index 61c0643171..a98e9ca5a0 100644
--- a/its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5530/plugin/pom.xml
@@ -29,7 +29,7 @@ under the License.
   <packaging>maven-plugin</packaging>
 
   <properties>
-    <maven-version>3.1.2-SNAPSHOT</maven-version>
+    <maven-version>[3.1.2-SNAPSHOT,)</maven-version>
   </properties>
 
   <dependencies>
diff --git a/its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopeMojo.java b/its/core-it-suite/src/test/resources/mng-5530/plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopeMojo.java
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopeMojo.java
rename to its/core-it-suite/src/test/resources/mng-5530/plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopeMojo.java
diff --git a/its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java b/its/core-it-suite/src/test/resources/mng-5530/plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java
rename to its/core-it-suite/src/test/resources/mng-5530/plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java