diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 426840f6c02c..3adeebbf527d 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -131,7 +131,8 @@ dependencies {
   jcaCompile sourceSets.main.output
 
   testCompile project(':geode-junit')
-  testCompile project(':geode-old-versions')
+
+  testCompile files(project(':geode-old-versions').sourceSets.main.output)
 
   // Test Dependencies
   // External
diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle
index 1618f6ec2537..c394630fb4ec 100644
--- a/geode-old-versions/build.gradle
+++ b/geode-old-versions/build.gradle
@@ -20,6 +20,10 @@ disableMavenPublishing()
 
 project.ext.installs = new Properties();
 
+dependencies {
+  testCompile project(":geode-junit")
+}
+
 def addOldVersion(def source, def geodeVersion, def downloadInstall) {
   sourceSets.create(source, {
     compileClasspath += configurations.provided
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java b/geode-old-versions/src/main/java/org/apache/geode/test/dunit/standalone/VersionManager.java
similarity index 98%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java
rename to geode-old-versions/src/main/java/org/apache/geode/test/dunit/standalone/VersionManager.java
index f13718b748f6..a601bfd5e72a 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java
+++ b/geode-old-versions/src/main/java/org/apache/geode/test/dunit/standalone/VersionManager.java
@@ -26,15 +26,13 @@
 import java.util.Properties;
 import java.util.function.BiConsumer;
 
-import org.apache.geode.test.dunit.Host;
-
 /**
  * VersionManager loads the class-paths for all of the releases of Geode configured for
  * backward-compatibility testing in the geode-core build.gradle file.
  * <p>
  * Tests may use these versions in launching VMs to run older clients or servers.
  *
- * @see Host#getVM(String, int)
+ * see Host.getVM(String, int)
  */
 public class VersionManager {
   public static final String CURRENT_VERSION = "000";
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java b/geode-old-versions/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
similarity index 94%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
rename to geode-old-versions/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
index 94027e64caeb..b01d57093050 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
+++ b/geode-old-versions/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
@@ -14,7 +14,6 @@
  */
 package org.apache.geode.test.dunit.standalone;
 
-import static org.apache.geode.internal.Assert.assertTrue;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.junit.Assert;
@@ -45,6 +44,6 @@ public void exceptionIsThrownOnUse() throws Exception {
   @Test
   public void managerIsAbleToFindVersions() throws Exception {
     VersionManager instance = VersionManager.getInstance();
-    assertTrue(instance.getVersionsWithoutCurrent().size() > 0);
+    Assert.assertTrue(instance.getVersionsWithoutCurrent().size() > 0);
   }
 }