diff --git a/.circleci/config.yml b/.circleci/config.yml
index f3d44a85ab..b3be5c1680 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -128,18 +128,18 @@ jobs:
       - image: circleci/python:3.6
         environment:
           TOXENV: py36-rpc-state-homestead
-  py36-rpc-state-eip150:
+  py36-rpc-state-tangerine_whistle:
     <<: *common
     docker:
       - image: circleci/python:3.6
         environment:
-          TOXENV: py36-rpc-state-eip150
-  py36-rpc-state-eip158:
+          TOXENV: py36-rpc-state-tangerine_whistle
+  py36-rpc-state-spurious_dragon:
     <<: *common
     docker:
       - image: circleci/python:3.6
         environment:
-          TOXENV: py36-rpc-state-eip158
+          TOXENV: py36-rpc-state-spurious_dragon
   py36-rpc-blockchain:
     <<: *common
     docker:
@@ -211,8 +211,8 @@ workflows:
       - py36-rpc-state-constantinople
       - py36-rpc-state-frontier
       - py36-rpc-state-homestead
-      - py36-rpc-state-eip150
-      - py36-rpc-state-eip158
+      - py36-rpc-state-tangerine_whistle
+      - py36-rpc-state-spurious_dragon
       - py36-rpc-state-quadratic
       - py36-rpc-blockchain
 
diff --git a/tox.ini b/tox.ini
index da41e007f7..4a4708f4a3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist=
     py{36,37}-{core,p2p,integration,lightchain_integration}
-    py{36}-rpc-state-{frontier,homestead,eip150,eip158,byzantium,constantinople,quadratic}
+    py{36}-rpc-state-{frontier,homestead,tangerine_whistle,spurious_dragon,byzantium,constantinople,quadratic}
     py{36}-rpc-blockchain
     py{36,37}-lint
     py36-docs
@@ -22,8 +22,8 @@ commands=
     rpc-blockchain: pytest {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'not GeneralStateTests'}
     rpc-state-frontier: pytest {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Frontier'}
     rpc-state-homestead: pytest {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Homestead'}
-    rpc-state-eip150: pytest {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and EIP150'}
-    rpc-state-eip158: pytest {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and EIP158'}
+    rpc-state-tangerine_whistle: pytest {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and EIP150'}
+    rpc-state-spurious_dragon: pytest {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and EIP158'}
     # The following test seems to consume a lot of memory. Restricting to 3 processes reduces crashes
     rpc-state-byzantium: pytest -n3 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Byzantium'}
     rpc-state-constantinople: pytest -n3 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Constantinople'}