diff --git a/test/cql-pytest/run b/test/cql-pytest/run
index 5935937706..cce4318c80 100755
--- a/test/cql-pytest/run
+++ b/test/cql-pytest/run
@@ -14,6 +14,19 @@ else:
     cmd = run.run_scylla_cmd
     check_cql = run.check_cql
 
+# If the "--vnodes" option is given, drop the "tablets" experimental
+# feature (turned on in run.py) so that all tests will be run with the
+# old vnode-based replication instead of tablets. This option only has
+# temporary usefulness, and should eventually be removed.
+if '--vnodes' in sys.argv:
+    sys.argv.remove('--vnodes')
+    def run_without_tablets(pid, dir):
+        (c, e) = run_without_tablets.orig_cmd(pid, dir)
+        c.remove('--experimental-features=tablets')
+        return (c, e)
+    run_without_tablets.orig_cmd = cmd
+    cmd = run_without_tablets
+
 if "-h" in sys.argv or "--help" in sys.argv:
     run.run_pytest(sys.path[0], sys.argv)
     exit(0)