diff --git a/.travis.yml b/.travis.yml
index 2373658..a4c7a50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,13 @@ language: python
 
 matrix:
   include:
-    - python: 3.7
+    - python: 3.7-dev
       dist: xenial
       env: TOXENV=py37-test
-    - python: 3.7
+    - python: 3.7-dev
       dist: xenial
       env: TOXENV=lint
-    - python: 3.7
+    - python: 3.7-dev
       dist: xenial
       env: TOXENV=py37-interop
       sudo: true
diff --git a/install_interop_go_pkgs.sh b/install_interop_go_pkgs.sh
index 585d620..0f1e025 100755
--- a/install_interop_go_pkgs.sh
+++ b/install_interop_go_pkgs.sh
@@ -13,15 +13,18 @@ go version
 # Install `p2pd`
 # FIXME: Use the canonical repo in libp2p, when we don't need `insecure`.
 if [ ! -e "$DAEMON_PATH" ]; then
-    git clone git@github.com:mhchia/$DAEMON_REPO.git --branch test/add-options $DAEMON_PATH
+    git clone https://github.com/mhchia/$DAEMON_REPO.git --branch test/add-options $DAEMON_PATH
+    if [ "$?" != 0 ]; then
+        echo "Failed to clone the daemon repo"
+        exit 1
+    fi
 fi
-cd $DAEMON_PATH
-go install ./...
+
+cd $DAEMON_PATH && go install ./...
 
 cd -
 
 # Install example modeuls
-cd $EXAMPLES_PATHS
-go install ./...
+cd $EXAMPLES_PATHS && go install ./...
 
 echo "Finish installing go modeuls for interop."