diff --git a/.travis.yml b/.travis.yml
index bdbcbc78..dac913d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ env:
   - secure: J4i75AV4KMrU/UQrLIzzIh35Xix40Ki0uWjm8j05oxlXVl5aPU2zB30AemDne2QXYzkN4kRG/iRnNORE/8D0lF7YipQNSNxgfiBVoOEfj/NSogvI2BftYX9vlLZJUvt+s/nbE3xa/Pyge1IPv7itDYGO7SMe8RTSqitgqyfE2Eg=
   - FEATURES="tlsv1_1 tlsv1_2 aes_xts"
 before_script:
-- openssl s_server -accept 15418 -www -cert test/cert.pem -key test/key.pem >/dev/null 2>&1 &
+- 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)
 - (cd openssl && cargo test --features $FEATURES)
diff --git a/.travis/build_docs.sh b/.travis/build_docs.sh
index 80c54ed0..67f1845c 100755
--- a/.travis/build_docs.sh
+++ b/.travis/build_docs.sh
@@ -7,5 +7,5 @@ mkdir doc
 for crate in $(echo openssl-sys openssl); do
     mkdir -p $crate/target
     ln -s -t $crate/target ../../doc
-    (cd $crate && cargo doc --no-deps --features $FEATURES)
+    (cd $crate && cargo doc --no-deps --features "$FEATURES")
 done
diff --git a/test/cert.pem b/openssl/test/cert.pem
similarity index 100%
rename from test/cert.pem
rename to openssl/test/cert.pem
diff --git a/test/key.pem b/openssl/test/key.pem
similarity index 100%
rename from test/key.pem
rename to openssl/test/key.pem