diff --git a/.travis.yml b/.travis.yml
index 849bc1b7..c383cbc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_script:
 - openssl s_server -accept 15418 -www -cert openssl/test/cert.pem -key openssl/test/key.pem >/dev/null 2>&1 &
 script:
 - (cd openssl && cargo test)
-- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && cargo test --features $FEATURES))
+- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && cargo test --features "$FEATURES"))
 - ./.travis/build_docs.sh
 after_success:
 - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && ./.travis/update_docs.sh
diff --git a/.travis/build_docs.sh b/.travis/build_docs.sh
index 67f1845c..5ce9ed30 100755
--- a/.travis/build_docs.sh
+++ b/.travis/build_docs.sh
@@ -6,6 +6,6 @@ mkdir doc
 
 for crate in $(echo openssl-sys openssl); do
     mkdir -p $crate/target
-    ln -s -t $crate/target ../../doc
+    (cd $crate/target && ln -s ../../doc)
     (cd $crate && cargo doc --no-deps --features "$FEATURES")
 done