diff --git a/.travis.yml b/.travis.yml
index 96f5e7005..69f98fc5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,22 +10,32 @@ env:
     - BUILD=test
       # Default build, see Makefile
 
-    - BUILD=test DAV_SERVER=radicale RADICALE_BACKEND=filesystem REQUIREMENTS=release
+    - BUILD=style
+      # flake8 with plugins
+
+    # REMOTESTORAGE TESTS
+
+    - BUILD=test REMOTESTORAGE_SERVER=restore
+      # Testing against reStore
+
+    # DAV TESTS
+
+    - BUILD=test DAV_SERVER=radicale RADICALE_BACKEND=filesystem
+      # Radicale-release with filesystem storage
+
+    - BUILD=test DAV_SERVER=radicale RADICALE_BACKEND=filesystem
       PKGS='lxml==3.0 requests==2.4.1 requests_toolbelt==0.4.0 click==5.0'
       # Minimal requirements
 
     - BUILD=test DAV_SERVER=radicale RADICALE_BACKEND=filesystem REQUIREMENTS=devel
-      # Radicale-git with filesystem storage (default)
+      # Radicale-git with filesystem storage
 
-    - BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release
+    - BUILD=test DAV_SERVER=owncloud
       # Latest ownCloud release
 
-    - BUILD=test DAV_SERVER=baikal REQUIREMENTS=release
+    - BUILD=test DAV_SERVER=baikal
       # Latest Baikal release
 
-    - BUILD=style
-      # flake8 with plugins
-
 install:
     - "pip install -U pip"
     - "pip install wheel"
diff --git a/Makefile b/Makefile
index 3a6ddfc0b..495c4fd07 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@
 # If you want to skip the DAV tests against Radicale, use:
 #     make DAV_SERVER=skip # ...
 
-export DAV_SERVER := radicale
-export REMOTESTORAGE_SERVER := restore
+export DAV_SERVER := skip
+export REMOTESTORAGE_SERVER := skip
 export RADICALE_BACKEND := filesystem
 export REQUIREMENTS := release
 export TESTSERVER_BASE := ./tests/storage/servers/