Replace usage environment variables
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
index 21d8eb8..1a48100 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
@@ -52,7 +52,7 @@
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4590" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.setEnvironmentVariable( "MAVEN_OPTS", "-Dtest.file=pom.xml" );
+        verifier.setSystemProperty( "test.file", "pom.xml" );
         verifier.setSystemProperty( "test.dir", testDir.getAbsolutePath() );
         verifier.addCliOption( "--settings" );
         verifier.addCliOption( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
index 1c3e067..906bb32 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
@@ -53,6 +53,8 @@
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
+        
+        // Used for M3.3.1-, otherwise .mvn/jvm.config is used
         verifier.setEnvironmentVariable( "MAVEN_OPTS", "-javaagent:agent.jar" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -63,5 +65,4 @@
         assertNotNull( props1.get( "Mng4747Agent" ) );
         assertEquals( props1.get( "Mng4747Agent" ), props2.get( "Mng4747Agent" ) );
     }
-
 }
diff --git a/core-it-suite/src/test/resources/mng-4747/.mvn/jvm.config b/core-it-suite/src/test/resources/mng-4747/.mvn/jvm.config
new file mode 100644
index 0000000..ab3fa03
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4747/.mvn/jvm.config
@@ -0,0 +1 @@
+-javaagent:agent.jar
\ No newline at end of file