diff --git a/util/classpath/src/main/scala/sbt/classpath/ClassLoaderCache.scala b/util/classpath/src/main/scala/sbt/classpath/ClassLoaderCache.scala
index 645f45747..2e489eb6f 100644
--- a/util/classpath/src/main/scala/sbt/classpath/ClassLoaderCache.scala
+++ b/util/classpath/src/main/scala/sbt/classpath/ClassLoaderCache.scala
@@ -6,7 +6,7 @@ import java.net.URLClassLoader
 import java.util.HashMap
 
 // Hack for testing only
-private[sbt] final class ClassLoaderCache(val commonParent: ClassLoader, errorEvicted: Boolean = false) {
+private[sbt] final class ClassLoaderCache(val commonParent: ClassLoader) {
   private[this] val delegate = new HashMap[List[File], Reference[CachedClassLoader]]
 
   /**
@@ -27,7 +27,6 @@ private[sbt] final class ClassLoaderCache(val commonParent: ClassLoader, errorEv
 
   private[this] def get(files: List[File], stamps: List[Long], existing: CachedClassLoader): ClassLoader =
     if (existing == null || stamps != existing.timestamps) {
-      if (existing == null && errorEvicted) sys.error(s"Evicted classloader for [${files mkString ", "}]!!!! Not allowed, Travis!")
       newEntry(files, stamps)
     } else
       existing.loader
diff --git a/util/classpath/src/test/scala/sbt/classpath/ConcurrentCache.scala b/util/classpath/src/test/scala/sbt/classpath/ConcurrentCache.scala
deleted file mode 100644
index 9ac26af5c..000000000
--- a/util/classpath/src/test/scala/sbt/classpath/ConcurrentCache.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-package sbt
-package classpath
-
-import org.scalacheck._
-import Prop._
-import java.io.File
-
-object ConcurrentCache extends Properties("ClassLoaderCache concurrent access") {
-  implicit lazy val concurrentArb: Arbitrary[Int] = Arbitrary(Gen.choose(1, 1000))
-  implicit lazy val filenameArb: Arbitrary[String] = Arbitrary(Gen.alphaStr)
-
-  private[this] object DifferentClassloader {
-    def unapply(loaders: Seq[ClassLoader]): Option[(ClassLoader, ClassLoader)] =
-      if (loaders.size > 1) loaders.sliding(2).find { case Seq(x, y) => x != y } map { case Seq(x, y) => (x, y) }
-      else None
-  }
-
-  private def showCp(cp: ClassLoader): String = cp match {
-    case u: java.net.URLClassLoader => u.getURLs.mkString("UrlClassLoader(", ", ", ")")
-    case _                          => cp.toString
-  }
-
-  property("Same class loader for same classpaths concurrently processed") = forAll { (names: List[String], concurrent: Int) =>
-    withcp(names.distinct) { files =>
-      val cache = new ClassLoaderCache(null, errorEvicted = true)
-      val loaders = (1 to concurrent).par.map(_ => cache(files)).toList
-      loaders match {
-        case DifferentClassloader(left, right) => false :| s"${showCp(left)} != ${showCp(right)}"
-        case _                                 => true :| ""
-      }
-    }
-  }
-
-  private[this] def withcp[T](names: List[String])(f: List[File] => T): T = IO.withTemporaryDirectory { tmp =>
-    val files = names.sorted.map { name =>
-      val file = new File(tmp, name)
-      IO.touch(file)
-      file
-    }
-    f(files)
-  }
-}
\ No newline at end of file