diff --git a/qa/evil-tests/build.gradle b/qa/evil-tests/build.gradle
index bddca74f959..96aa6fb635d 100644
--- a/qa/evil-tests/build.gradle
+++ b/qa/evil-tests/build.gradle
@@ -17,8 +17,20 @@
  * under the License.
  */
 
+/*
+ * Evil tests that need to do unrealistic things: test OS security
+ * integration, change default filesystem impl, mess with arbitrary
+ * threads, etc.
+ */
+
 apply plugin: 'elasticsearch.standalone-test'
 
+dependencies {
+  testCompile 'com.google.jimfs:jimfs:1.0'
+}
+
+// TODO: give each evil test its own fresh JVM for more isolation.
+
 test {
   systemProperty 'tests.security.manager', 'false'
 }
diff --git a/core/src/test/java/org/elasticsearch/common/cli/CheckFileCommandTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/common/cli/CheckFileCommandTests.java
similarity index 100%
rename from core/src/test/java/org/elasticsearch/common/cli/CheckFileCommandTests.java
rename to qa/evil-tests/src/test/java/org/elasticsearch/common/cli/CheckFileCommandTests.java
diff --git a/test-framework/build.gradle b/test-framework/build.gradle
index b4f4411d27b..a1d96a77f6f 100644
--- a/test-framework/build.gradle
+++ b/test-framework/build.gradle
@@ -33,7 +33,6 @@ dependencies {
   compile('org.hamcrest:hamcrest-all:1.3') {
     exclude group: 'org.hamcrest', module: 'hamcrest-core'
   }
-  compile 'com.google.jimfs:jimfs:1.0'
   compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
 }