diff --git a/pom.xml b/pom.xml
index 48917f4aa04..24d616b6bd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
                 <version>3.0.0-M5</version>
                 <configuration>
                     <parallel>suites</parallel>
-                    <threadCount>5</threadCount>
+                    <perCoreThreadCount>true</perCoreThreadCount>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/test/java/org/codetracker/util/AttributeOracleTest.java b/src/test/java/org/codetracker/util/AttributeOracleTest.java
index c4a2cd35525..a0d6e858258 100644
--- a/src/test/java/org/codetracker/util/AttributeOracleTest.java
+++ b/src/test/java/org/codetracker/util/AttributeOracleTest.java
@@ -7,11 +7,13 @@
 import org.codetracker.experiment.oracle.AttributeOracle;
 import org.codetracker.experiment.oracle.history.AttributeHistoryInfo;
 import org.eclipse.jgit.lib.Repository;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.provider.Arguments;
 
 import java.io.IOException;
 import java.util.stream.Stream;
 
+@Disabled
 public class AttributeOracleTest extends OracleTest {
 	private static final String EXPECTED = System.getProperty("user.dir") + "/src/test/resources/attribute/";
 
diff --git a/src/test/java/org/codetracker/util/BlockOracleTest.java b/src/test/java/org/codetracker/util/BlockOracleTest.java
index 849d94e3b6b..b0e5eba8ee5 100644
--- a/src/test/java/org/codetracker/util/BlockOracleTest.java
+++ b/src/test/java/org/codetracker/util/BlockOracleTest.java
@@ -8,11 +8,13 @@
 import org.codetracker.experiment.oracle.BlockOracle;
 import org.codetracker.experiment.oracle.history.BlockHistoryInfo;
 import org.eclipse.jgit.lib.Repository;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.provider.Arguments;
 
 import java.io.IOException;
 import java.util.stream.Stream;
 
+@Disabled
 public class BlockOracleTest extends OracleTest {
 	private static final String EXPECTED = System.getProperty("user.dir") + "/src/test/resources/block/";
 
diff --git a/src/test/java/org/codetracker/util/VariableOracleTest.java b/src/test/java/org/codetracker/util/VariableOracleTest.java
index a064d6c6df4..60c543bbd97 100644
--- a/src/test/java/org/codetracker/util/VariableOracleTest.java
+++ b/src/test/java/org/codetracker/util/VariableOracleTest.java
@@ -7,11 +7,13 @@
 import org.codetracker.experiment.oracle.VariableOracle;
 import org.codetracker.experiment.oracle.history.VariableHistoryInfo;
 import org.eclipse.jgit.lib.Repository;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.provider.Arguments;
 
 import java.io.IOException;
 import java.util.stream.Stream;
 
+@Disabled
 public class VariableOracleTest extends OracleTest {
 	private static final String EXPECTED = System.getProperty("user.dir") + "/src/test/resources/variable/";