diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh
index 8011205db..c2c8760ef 100755
--- a/scripts/travis-emscripten/build_emscripten.sh
+++ b/scripts/travis-emscripten/build_emscripten.sh
@@ -94,6 +94,9 @@ make -j 4
 
 cd ..
 mkdir -p upload
+# Patch soljson.js to provide backwards-compatibility with older emscripten versions
+# TODO: remove in 0.6.0!
+echo -n ";/* backwards compatibility */ Module['Runtime'] = Module; Module['Pointer_stringify'] = Module['UTF8ToString'];" >> $BUILD_DIR/libsolc/soljson.js
 cp $BUILD_DIR/libsolc/soljson.js upload/
 cp $BUILD_DIR/libsolc/soljson.js ./
 
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index e5a2dd3e7..dd9aa77aa 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -37,7 +37,7 @@ function setup_solcjs
 
     cd "$dir"
     printLog "Setting up solc-js..."
-    git clone --depth 1 -b master https://github.com/ethereum/solc-js.git solc
+    git clone --depth 1 -b v0.5.0 https://github.com/ethereum/solc-js.git solc
 
     cd solc
     npm install
@@ -107,7 +107,7 @@ function force_solc_truffle_modules
         if [ -d "$d" ]; then
             cd $d
             rm -rf solc
-            git clone --depth 1 -b master https://github.com/ethereum/solc-js.git solc
+            git clone --depth 1 -b v0.5.0 https://github.com/ethereum/solc-js.git solc
             cp "$1" solc/soljson.js
         fi
     )
diff --git a/test/solcjsTests.sh b/test/solcjsTests.sh
index df2554c21..d525a3f21 100755
--- a/test/solcjsTests.sh
+++ b/test/solcjsTests.sh
@@ -40,7 +40,7 @@ VERSION="$2"
 DIR=$(mktemp -d)
 (
     echo "Preparing solc-js (master)..."
-    git clone --depth 1 --branch master https://github.com/ethereum/solc-js "$DIR"
+    git clone --depth 1 --branch v0.5.0 https://github.com/ethereum/solc-js "$DIR"
     cd "$DIR"
     # disable "prepublish" script which downloads the latest version
     # (we will replace it anyway and it is often incorrectly cached