diff --git a/test/externalTests.sh b/test/externalTests.sh
index 126b13b5d..f87777e3e 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -59,10 +59,13 @@ function test_truffle
       for d in node_modules node_modules/truffle/node_modules
       do
       (
-        cd $d
-        rm -rf solc
-        git clone --depth 1 -b v0.5.0 https://github.com/ethereum/solc-js.git solc
-        cp "$SOLJSON" solc/
+        if [ -d "$d" ]
+        then
+          cd $d
+          rm -rf solc
+          git clone --depth 1 -b v0.5.0 https://github.com/ethereum/solc-js.git solc
+          cp "$SOLJSON" solc/
+        fi
       )
       done
       if [ "$name" == "Zeppelin" -o "$name" == "Gnosis" ]; then
@@ -85,8 +88,8 @@ function test_truffle
     rm -rf "$DIR"
 }
 
-# Using our temporary fork here. Hopefully to be merged into upstream after the 0.5.0 release.
-test_truffle Zeppelin https://github.com/axic/openzeppelin-solidity.git solidity-050
+# Since Zeppelin 2.1.1 it supports Solidity 0.5.0.
+test_truffle Zeppelin https://github.com/OpenZeppelin/openzeppelin-solidity.git master
 
 # Disabled temporarily as it needs to be updated to latest Truffle first.
 #test_truffle Gnosis https://github.com/axic/pm-contracts.git solidity-050