diff --git a/.ahoy.yml b/.ahoy.yml
index 6d9a01bd..196a97c4 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -214,9 +214,7 @@ commands:
     usage: Stops CKAN background job worker
     cmd: |
       ahoy title 'Stopping CKAN background job worker'
-      ahoy cli "ckan_cli jobs clear; \
-                ckan_cli jobs clear priority; \
-                ckan_cli jobs clear bulk;
+      ahoy cli "ckan_cli jobs clear;
                 (pgrep 'jobs worker' && pkill -f 'jobs worker') || true"
 
   # Utilities.
diff --git a/test/features/environment.py b/test/features/environment.py
index 63c305d1..a47f08f0 100644
--- a/test/features/environment.py
+++ b/test/features/environment.py
@@ -118,4 +118,5 @@ def before_scenario(context, scenario):
 
 
 def after_scenario(context, scenario):
+    os.system("ckan_cli jobs clear")
     benv.after_scenario(context, scenario)