diff --git a/.travis.yml b/.travis.yml
index 70fe1ac..aeb1ac0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,12 @@ matrix:
     include:
         - python: 2.7
           env: BUILD=style
+        - python: 2.7
+          env: BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=devel
+        - python: 2.7
+          env: BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=release
+        - python: 2.7
+          env: BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal
         - python: 2.7
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel
         - python: 2.7
@@ -68,6 +74,12 @@ matrix:
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal
         - python: 3.5
           env: BUILD=style
+        - python: 3.5
+          env: BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=devel
+        - python: 3.5
+          env: BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=release
+        - python: 3.5
+          env: BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal
         - python: 3.5
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel
         - python: 3.5
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 88f1a5c..bc80235 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -57,13 +57,23 @@ with section("matrix"):
 
             if python in ("2.7", "3.5"):
                 dav_servers = ("radicale", "owncloud", "baikal", "davical")
+                rs_servers = ("mysteryshack",)
             else:
                 dav_servers = ("radicale",)
+                rs_servers = ()
 
-            for dav_server, requirements in itertools.product(
-                dav_servers,
+            for (server_type, server), requirements in itertools.product(
+                itertools.chain(
+                    (("REMOTESTORAGE", x) for x in rs_servers),
+                    (("DAV", x) for x in dav_servers)
+                ),
                 ("devel", "release", "minimal")
             ):
                 h()
-                p("  env: BUILD=test DAV_SERVER={} REQUIREMENTS={}"
-                  .format(dav_server, requirements))
+                p("  env: "
+                  "BUILD=test "
+                  "{server_type}_SERVER={server} "
+                  "REQUIREMENTS={requirements}"
+                  .format(server_type=server_type,
+                          server=server,
+                          requirements=requirements))