diff --git a/.travis.yml b/.travis.yml
index ede3f573..21634329 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,23 @@ sudo: false
 rust:
 - nightly
 - beta
-- stable
+- 1.4.0
 os:
 - osx
 - linux
 env:
-  global:
-    - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto pkcs5_pbkdf2_hmac"
+  matrix:
+  - TEST_FEATURES=false
+  - TEST_FEATURES=true
+matrix:
+  include:
+  - os: linux
+    env: TARGET=arm-unknown-linux-gnueabihf TEST_FEATURES=true
+    rust: 1.4.0
+  exclude:
+  - os: osx
+    env: TEST_FEATURES=true
 before_install:
-- (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh)
+- ./openssl/test/build.sh
 script:
-- (test $TRAVIS_OS_NAME != "osx" || (cd openssl && cargo test))
-- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && OPENSSL_LIB_DIR=$HOME/openssl/lib OPENSSL_INCLUDE_DIR=$HOME/openssl/include LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH PATH=$HOME/openssl/bin:$PATH cargo test))
-- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && OPENSSL_LIB_DIR=$HOME/openssl/lib OPENSSL_INCLUDE_DIR=$HOME/openssl/include LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH PATH=$HOME/openssl/bin:$PATH cargo test --features "$FEATURES"))
+- ./openssl/test/run.sh
diff --git a/openssl/test/build.sh b/openssl/test/build.sh
index 9b336b77..2cbfb61a 100755
--- a/openssl/test/build.sh
+++ b/openssl/test/build.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 set -e
 
+if [ $TRAVIS_OS_NAME -eq "osx" ]; then
+    exit 0
+fi
+
 mkdir /tmp/openssl
 cd /tmp/openssl
 curl https://openssl.org/source/openssl-1.0.2e.tar.gz | tar --strip-components=1 -xzf -
diff --git a/openssl/test/run.sh b/openssl/test/run.sh
new file mode 100755
index 00000000..91143b77
--- /dev/null
+++ b/openssl/test/run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+if [ $TEST_FEATURES == "true" ]; then
+    FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto pkcs5_pbkdf2_hmac"
+fi
+
+if [ $TRAVIS_OS_NAME != "osx" ]; then
+    export OPENSSL_LIB_DIR=$HOME/openssl/lib
+    export OPENSSL_INCLUDE_DIR=$HOME/openssl/include
+    export LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH
+fi
+
+cargo test --manifest-path=openssl/Cargo.toml --features "$FEATURES"