diff --git a/.travis.yml b/.travis.yml
index afe5bce7..36b926d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 addons:
   apt:
     packages:
-    - gcc-4.6-arm-linux-gnueabihf
+    - gcc-arm-linux-gnueabihf
 rust:
 - nightly
 - beta
@@ -16,10 +16,10 @@ env:
   - TEST_FEATURES=false
   - TEST_FEATURES=true
 matrix:
-  include:
-  - os: linux
-    env: TARGET=arm-unknown-linux-gnueabihf TEST_FEATURES=true
-    rust: 1.4.0
+    #  include:
+    #  - os: linux
+    #    env: TARGET=arm-unknown-linux-gnueabihf TEST_FEATURES=true
+    #    rust: 1.4.0
   exclude:
   - os: osx
     env: TEST_FEATURES=true
diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs
index 7fdbb750..7ed8fc3b 100644
--- a/openssl/src/ssl/tests/mod.rs
+++ b/openssl/src/ssl/tests/mod.rs
@@ -75,7 +75,7 @@ impl Server {
 
     fn new_tcp(args: &[&str]) -> (Server, TcpStream) {
         let (server, addr) = Server::spawn(args, None);
-        loop {
+        for _ in 0..20 {
             match TcpStream::connect(&addr) {
                 Ok(s) => return (server, s),
                 Err(ref e) if e.kind() == io::ErrorKind::ConnectionRefused => {
@@ -84,6 +84,7 @@ impl Server {
                 Err(e) => panic!("wut: {}", e),
             }
         }
+        panic!("server never came online");
     }
 
     fn new() -> (Server, TcpStream) {
diff --git a/openssl/test/build.sh b/openssl/test/build.sh
index a10cd8ad..f52ded60 100755
--- a/openssl/test/build.sh
+++ b/openssl/test/build.sh
@@ -5,13 +5,17 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
     exit 0
 fi
 
-if [ -n "$TARGET" ]; then
-    FLAGS="os/compiler=$TARGET-"
+if [ "$TARGET" == "arm-unknown-linux-gnueabihf" ]; then
+    export C_INCLUDE_PATH=/usr/arm-linux-gnueabihf/include
+    CROSS=arm-linux-gnueabihf-
+    OS_COMPILER=linux-armv4
+else
+    OS_COMPILER=linux-x86_64
 fi
 
 mkdir /tmp/openssl
 cd /tmp/openssl
 curl https://openssl.org/source/openssl-1.0.2e.tar.gz | tar --strip-components=1 -xzf -
-./Configure --prefix=$HOME/openssl shared $FLAGS
+./Configure --prefix=$HOME/openssl shared --cross-compile-prefix=$CROSS $OS_COMPILER
 make
 make install
diff --git a/openssl/test/run.sh b/openssl/test/run.sh
index ca029ef2..229d9a1d 100755
--- a/openssl/test/run.sh
+++ b/openssl/test/run.sh
@@ -28,4 +28,5 @@ else
     COMMAND="test"
 fi
 
+export PATH=$HOME/openssl/bin:$PATH
 (cd openssl && cargo $COMMAND $FLAGS --features "$FEATURES")