diff --git a/.travis.yml b/.travis.yml
index 8410026..8c05eb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,21 +56,23 @@ install:
     - make
     - popd
     - popd
+    - mkdir tests/uncategorized/path_traversal_zip/
+    - mkdir tests/uncategorized/path_traversal_rar/
     - mv path-traversal-samples/zip/*.zip tests/uncategorized/path_traversal_zip
     - mv path-traversal-samples/rar/*.rar tests/uncategorized/path_traversal_rar
     # Office docs
     - git clone https://github.com/eea/odfpy.git
-    - mv odfpy/tests/examples/* tests/uncategorized/odfpy
-    - pushd tests/uncategorized/
-    - mkdir olefile && pushd olefile
+    - mkdir tests/uncategorized/odfpy/
+    - mv odfpy/tests/examples/* tests/uncategorized/odfpy/
+    - mkdir tests/uncategorized/olefile
+    - pushd tests/uncategorized/olefile
     - wget https://bitbucket.org/decalage/olefileio_pl/raw/3073963b640935134ed0da34906fea8e506460be/Tests/images/test-ole-file.doc
     - popd
-    - mkdir fraunhofer && pushd fraunhofer
+    - mkdir tests/uncategorized/fraunhofer && pushd tests/uncategorized/fraunhofer
     - wget --no-check-certificate https://www.officedissector.com/corpus/fraunhoferlibrary.zip
     - unzip -o fraunhoferlibrary.zip
     - rm fraunhoferlibrary.zip
     - popd
-    - popd
     # - pushd tests/dangerous/
     # - 7z x -p42 42.zip
     # - popd