diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java
index ed0c034a4d..e1a200195c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java
@@ -23,6 +23,7 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
+import java.util.Collection;
 
 public class MavenIT0085Test
     extends AbstractMavenIntegrationTestCase
@@ -38,14 +39,18 @@ public class MavenIT0085Test
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0085" );
+
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "package" );
-        verifier.assertFileNotPresent( "war/target/war-1.0/WEB-INF/lib/pom.xml" );
-        verifier.assertFileNotPresent( "war/target/war-1.0/WEB-INF/lib/it0085-dep-1.0.jar" );
-        verifier.assertFilePresent( "war/target/war-1.0/WEB-INF/lib/junit-3.8.1.jar" );
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "target" );
+        verifier.deleteArtifacts( "org.apache.maven.its.it0085" );
+        verifier.getSystemProperties().setProperty( "test.home", testDir.getAbsolutePath() );
+        verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
+        Collection lines = verifier.loadLines( "target/test.txt", "UTF-8" );
+        assertTrue( lines.toString(), lines.contains( "system.jar" ) );
     }
-}
 
+}
diff --git a/its/core-it-suite/src/test/resources/it0085/dep/pom.xml b/its/core-it-suite/src/test/resources/it0085/dep/pom.xml
deleted file mode 100644
index 028388a9bd..0000000000
--- a/its/core-it-suite/src/test/resources/it0085/dep/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.maven.its.it0085</groupId>
-    <artifactId>maven-it-it0085</artifactId>
-    <version>1.0</version>
-  </parent>
-  <artifactId>dep</artifactId>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.it0085</groupId>
-      <artifactId>pom-dep</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/its/core-it-suite/src/test/resources/it0085/pom.xml b/its/core-it-suite/src/test/resources/it0085/pom.xml
index 9de05173d6..453d17e4c7 100644
--- a/its/core-it-suite/src/test/resources/it0085/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0085/pom.xml
@@ -1,29 +1,61 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <name>Maven Integration Test :: it0085</name> 
+
   <groupId>org.apache.maven.its.it0085</groupId>
-  <artifactId>maven-it-it0085</artifactId>
-  <description>Verify that system-scoped dependencies get resolved with system scope
-        when they are resolved transitively via another (non-system)
-        dependency. Inherited scope should not apply in the case of
-        system-scoped dependencies, no matter where they are.</description>
+  <artifactId>test</artifactId>
   <version>1.0</version>
   <packaging>pom</packaging>
 
-  <modules>
-    <module>dep</module>
-    <module>war</module>
-  </modules>
+  <name>Maven Integration Test :: it0085</name> 
+  <description>
+    Verify that system-scoped dependencies get resolved with system scope
+    when they are resolved transitively via another (non-system)
+    dependency. Inherited scope should not apply in the case of
+    system-scoped dependencies, no matter where they are.
+  </description>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.maven.its.it0085</groupId>
-        <artifactId>pom-dep</artifactId>
-        <version>1.4.2</version>
-        <scope>system</scope>
-        <systemPath>${basedir}/pom.xml</systemPath>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+  <repositories>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+      <releases>
+        <checksumPolicy>ignore</checksumPolicy>
+      </releases>
+      <snapshots>
+        <checksumPolicy>ignore</checksumPolicy>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.it0085</groupId>
+      <artifactId>dep</artifactId>
+      <version>0.1</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <testClassPath>target/test.txt</testClassPath>
+          <significantPathLevels>1</significantPathLevels>
+        </configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/its/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.jar b/its/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.jar
new file mode 100644
index 0000000000..3da1e6ce40
Binary files /dev/null and b/its/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.jar differ
diff --git a/its/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.pom b/its/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.pom
new file mode 100644
index 0000000000..0a0b9789b6
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.pom
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.it0085</groupId>
+  <artifactId>dep</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+    </repository>
+  </distributionManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.it0085</groupId>
+      <artifactId>system</artifactId>
+      <version>0.2</version>
+      <scope>system</scope>
+      <systemPath>${test.home}/system.jar</systemPath>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/its/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/maven-metadata.xml b/its/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/maven-metadata.xml
new file mode 100644
index 0000000000..a8e9e4ad20
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>org.apache.maven.its.it0085</groupId>
+  <artifactId>dep</artifactId>
+  <version>0.1</version>
+  <versioning>
+    <versions>
+      <version>0.1</version>
+    </versions>
+    <lastUpdated>20090106211325</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/it0085/system.jar b/its/core-it-suite/src/test/resources/it0085/system.jar
new file mode 100644
index 0000000000..66e582d1b8
Binary files /dev/null and b/its/core-it-suite/src/test/resources/it0085/system.jar differ
diff --git a/its/core-it-suite/src/test/resources/it0085/war/pom.xml b/its/core-it-suite/src/test/resources/it0085/war/pom.xml
deleted file mode 100644
index 0d09a021d6..0000000000
--- a/its/core-it-suite/src/test/resources/it0085/war/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.maven.its.it0085</groupId>
-    <artifactId>maven-it-it0085</artifactId>
-    <version>1.0</version>
-  </parent>
-  <artifactId>war</artifactId>
-  <packaging>war</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.its.it0085</groupId>
-      <artifactId>dep</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/its/core-it-suite/src/test/resources/it0085/war/src/main/webapp/WEB-INF/web.xml b/its/core-it-suite/src/test/resources/it0085/war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 692c8c3b9a..0000000000
--- a/its/core-it-suite/src/test/resources/it0085/war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<web-xml>
-</web-xml>