diff --git a/.gitmodules b/.gitmodules
index ade8997811f..cbbd9b6d2f0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,3 +6,7 @@
 	path = evmjit
 	url = https://github.com/ethereum/evmjit
 	branch = develop
+[submodule "libjson-rpc-cpp"]
+	path = libjson-rpc-cpp
+	url = https://github.com/cinemast/libjson-rpc-cpp
+	branch = master
diff --git a/scripts/tests.bat b/scripts/tests.bat
index 929590d73fe..bef6f6af563 100644
--- a/scripts/tests.bat
+++ b/scripts/tests.bat
@@ -33,7 +33,10 @@ if "%TESTS%"=="On" (
     REM Clone the end-to-end test repo, and point environment variable at it.
     cd ..
     git clone --depth 1 https://github.com/ethereum/tests.git
-    git checkout eip158
+    cd tests
+    git fetch origin
+    git checkout 652f0ebb6afa7d353d77fbc84f4d19e417927f38
+    cd ..
     set ETHEREUM_TEST_PATH=%APPVEYOR_BUILD_FOLDER%\..\tests
 
     REM Copy the DLLs into the test directory which need to be able to run.
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 6d0fbbd104d..81cee753e77 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -36,7 +36,9 @@ if [[ "$TESTS" == "On" ]]; then
     # Clone the end-to-end test repo, and point environment variable at it.
     cd ../..
     git clone https://github.com/ethereum/tests.git
+    cd tests
     git checkout eip158
+    cd ..
     export ETHEREUM_TEST_PATH=$(pwd)/tests/
 
     # Run the tests for the Interpreter