diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java
index e87147ccbf..fe1e24e545 100644
--- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java
+++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java
@@ -36,7 +36,7 @@ public class GeneralStateReferenceTestTools {
   private static final ReferenceTestProtocolSchedules REFERENCE_TEST_PROTOCOL_SCHEDULES =
       ReferenceTestProtocolSchedules.create();
   private static final List<String> SPECS_PRIOR_TO_DELETING_EMPTY_ACCOUNTS =
-      Arrays.asList("Frontier", "Homestead", "EIP-150");
+      Arrays.asList("Frontier", "Homestead", "EIP150");
 
   private static TransactionProcessor transactionProcessor(final String name) {
     return REFERENCE_TEST_PROTOCOL_SCHEDULES
@@ -87,62 +87,12 @@ public class GeneralStateReferenceTestTools {
     params.blacklist("static_Call1MB1024Calldepth-(Byzantium|Constantinople)");
 
     // Needs investigation (tests pass in other clients)
-    params.blacklist("NotEnoughCashContractCreation-Frontier");
-    params.blacklist("NotEnoughCashContractCreation-Homestead");
-    params.blacklist("NotEnoughCashContractCreation-EIP150");
-    params.blacklist("OutOfGasContractCreation-EIP150\\[0\\]");
-    params.blacklist("OutOfGasContractCreation-EIP150\\[2\\]");
-    params.blacklist("OutOfGasContractCreation-Homestead\\[0\\]");
-    params.blacklist("OutOfGasContractCreation-Homestead\\[2\\]");
-    params.blacklist("OutOfGasPrefundedContractCreation-EIP150");
-    params.blacklist("OutOfGasPrefundedContractCreation-Homestead");
-    params.blacklist("201503110226PYTHON_DUP6-EIP150");
-    params.blacklist("201503110226PYTHON_DUP6-Frontier");
-    params.blacklist("201503110226PYTHON_DUP6-Homestead");
-    params.blacklist("RevertOpcodeWithBigOutputInInit-EIP150\\[2\\]");
-    params.blacklist("RevertOpcodeWithBigOutputInInit-EIP150\\[3\\]");
-    params.blacklist("RevertOpcodeWithBigOutputInInit-Homestead\\[2\\]");
-    params.blacklist("RevertOpcodeWithBigOutputInInit-Homestead\\[3\\]");
-    params.blacklist("RevertOpcodeInInit-EIP150\\[2\\]");
-    params.blacklist("RevertOpcodeInInit-EIP150\\[3\\]");
-    params.blacklist("RevertOpcodeInInit-Homestead\\[2\\]");
-    params.blacklist("RevertOpcodeInInit-Homestead\\[3\\]");
     params.blacklist("suicideCoinbase-Frontier");
     params.blacklist("suicideCoinbase-Homestead");
-    params.blacklist("TransactionNonceCheck-EIP150");
-    params.blacklist("TransactionNonceCheck-Frontier");
-    params.blacklist("TransactionNonceCheck-Homestead");
-    params.blacklist("EmptyTransaction-EIP150");
-    params.blacklist("EmptyTransaction-Frontier");
-    params.blacklist("EmptyTransaction-Homestead");
-    params.blacklist("RefundOverflow-EIP150");
-    params.blacklist("RefundOverflow-Frontier");
-    params.blacklist("RefundOverflow-Homestead");
-    params.blacklist("TransactionToItselfNotEnoughFounds-EIP150");
-    params.blacklist("TransactionToItselfNotEnoughFounds-Frontier");
-    params.blacklist("TransactionToItselfNotEnoughFounds-Homestead");
-    params.blacklist("TransactionNonceCheck2-EIP150");
-    params.blacklist("TransactionNonceCheck2-Frontier");
-    params.blacklist("TransactionNonceCheck2-Homestead");
-    params.blacklist("CreateTransactionReverted-EIP150");
-    params.blacklist("CreateTransactionReverted-Frontier");
-    params.blacklist("CreateTransactionReverted-Homestead");
-    params.blacklist("RefundOverflow2-EIP150");
-    params.blacklist("RefundOverflow2-Frontier");
-    params.blacklist("RefundOverflow2-Homestead");
     params.blacklist("SuicidesMixingCoinbase-Frontier\\[0\\]");
     params.blacklist("SuicidesMixingCoinbase-Frontier\\[1\\]");
     params.blacklist("SuicidesMixingCoinbase-Homestead\\[0\\]");
     params.blacklist("SuicidesMixingCoinbase-Homestead\\[1\\]");
-    params.blacklist("createNameRegistratorPerTxsNotEnoughGasBefore-EIP150");
-    params.blacklist("createNameRegistratorPerTxsNotEnoughGasBefore-Homestead");
-    params.blacklist("createNameRegistratorPerTxsNotEnoughGasAfter-EIP150");
-    params.blacklist("createNameRegistratorPerTxsNotEnoughGasAfter-Homestead");
-    params.blacklist("createNameRegistratorPerTxsNotEnoughGasAt-EIP150");
-    params.blacklist("createNameRegistratorPerTxsNotEnoughGasAt-Homestead");
-    params.blacklist("UserTransactionGasLimitIsTooLowWhenZeroCost-EIP150");
-    params.blacklist("UserTransactionGasLimitIsTooLowWhenZeroCost-Frontier");
-    params.blacklist("UserTransactionGasLimitIsTooLowWhenZeroCost-Homestead");
 
     // Constantinople failures to investigate
     params.blacklist("RevertInCreateInInitCreate2-Constantinople");