diff --git a/build.gradle b/build.gradle
index 1e120f65..c106ca77 100644
--- a/build.gradle
+++ b/build.gradle
@@ -120,9 +120,8 @@ test {
     dependsOn('dist')
 
     systemProperties 'path.afu.scripts': "${afu}/scripts",
-            'use.hacks': true
-
-    systemProperties += [JDK_JAR: "${checkerFrameworkPath}/checker/dist/jdk8.jar"]
+            'path.inference.script': "${projectDir}/scripts/inference",
+            JDK_JAR: "${checkerFrameworkPath}/checker/dist/jdk8.jar"
 
     if (project.hasProperty('emit.test.debug')) {
         systemProperties += ["emit.test.debug": 'true']
@@ -276,7 +275,6 @@ task testCheckerInferenceDevScript(type: Exec, dependsOn: [dist, dependenciesJar
     args = ['--mode', 'INFER',
             '--checker', 'interning.InterningChecker',
             '--solver', 'checkers.inference.solver.MaxSat2TypeSolver',
-            '--hacks=true',
             'testdata/interning/MapAssignment.java']
 }
 
@@ -301,20 +299,6 @@ afterEvaluate {
 
     // Configure Tests
     tasks.withType(Test) {
-        dependsOn(shadowJar)
-
-        systemProperties 'path.afu.scripts': "${afu}/scripts",
-                'path.inference.script': "${projectDir}/scripts/inference",
-                'use.hacks': true,
-                JDK_JAR: "${checkerFrameworkPath}/checker/dist/jdk8.jar"
-
-        if (project.hasProperty('emit.test.debug')) {
-            systemProperties += ["emit.test.debug": 'true']
-        }
-
-        if (isJava8) {
-            jvmArgs += ["-Xbootclasspath/p:${configurations.javacJar.asPath}"]
-        }
 
         testLogging {
             // Always run the tests
diff --git a/src/checkers/inference/InferenceAnnotatedTypeFactory.java b/src/checkers/inference/InferenceAnnotatedTypeFactory.java
index 00f59ae9..4f6e5e7b 100644
--- a/src/checkers/inference/InferenceAnnotatedTypeFactory.java
+++ b/src/checkers/inference/InferenceAnnotatedTypeFactory.java
@@ -607,4 +607,3 @@ public AnnotatedTypeMirror getTypeOfExtendsImplements(Tree clause) {
     }
 
 }
-
diff --git a/tests/checkers/inference/DataflowInferenceTest.java b/tests/checkers/inference/DataflowInferenceTest.java
index bb530736..d016b6e5 100644
--- a/tests/checkers/inference/DataflowInferenceTest.java
+++ b/tests/checkers/inference/DataflowInferenceTest.java
@@ -24,11 +24,6 @@ public Pair<String, List<String>> getSolverNameAndOptions() {
                 new ArrayList<String>());
     }
 
-    @Override
-    public boolean useHacks() {
-        return true;
-    }
-
     @Parameters
     public static List<File> getTestFiles(){
         List<File> testfiles = new ArrayList<>();//InferenceTestUtilities.findAllSystemTests();