diff --git a/.drone.jsonnet b/.drone.jsonnet
index e33d98612..64669f76e 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -22,6 +22,7 @@ local debian_pipeline(name, image,
         cmake_extra='',
         extra_cmds=[],
         jobs=6,
+        tests=true,
         loki_repo=false,
         allow_fail=false) = {
     kind: 'pipeline',
@@ -55,10 +56,12 @@ local debian_pipeline(name, image,
                 'cmake .. -DWITH_SETCAP=OFF -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_BUILD_TYPE='+build_type+' ' +
                     (if werror then '-DWARNINGS_AS_ERRORS=ON ' else '') +
                     '-DWITH_LTO=' + (if lto then 'ON ' else 'OFF ') +
+                    (if tests then '' else '-DWITH_TESTS=OFF ') +
                 cmake_extra,
                 'VERBOSE=1 make -j' + jobs,
-                '../contrib/ci/drone-gdb.sh ./test/testAll --use-colour yes',
-            ] + extra_cmds,
+            ]
+            + (if tests then ['../contrib/ci/drone-gdb.sh ./test/testAll --use-colour yes'] else [])
+            + extra_cmds,
         }
     ],
 };
@@ -253,7 +256,7 @@ local mac_builder(name,
     ]),
 
     // Static build (on bionic) which gets uploaded to builds.lokinet.dev:
-    debian_pipeline("Static (bionic amd64)", docker_base+'ubuntu-bionic', deps='g++-8 python3-dev automake libtool', lto=true,
+    debian_pipeline("Static (bionic amd64)", docker_base+'ubuntu-bionic', deps='g++-8 python3-dev automake libtool', lto=true, tests=false,
                     cmake_extra='-DBUILD_STATIC_DEPS=ON -DBUILD_SHARED_LIBS=OFF -DSTATIC_LINK=ON -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 ' +
                         '-DCMAKE_CXX_FLAGS="-march=x86-64 -mtune=haswell" -DCMAKE_C_FLAGS="-march=x86-64 -mtune=haswell" -DNATIVE_BUILD=OFF ' +
                         '-DWITH_SYSTEMD=OFF',