diff --git a/zuul-tests.d/artifactory-roles.yaml b/zuul-tests.d/artifactory-roles.yaml
deleted file mode 100644
index 6ae2910c4..000000000
--- a/zuul-tests.d/artifactory-roles.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- job:
-    name: zuul-jobs-test-upload-artifactory
-    description: Test the upload-artifactory role
-    files:
-      - roles/upload-artifactory/.*
-      - test-playbooks/artifactory/.*
-    run: test-playbooks/artifactory/run.yaml
-    cleanup-run: test-playbooks/artifactory/cleanup.yaml
-
-- project:
-    check:
-      jobs: &id001
-        - zuul-jobs-test-upload-artifactory
-    gate:
-      jobs: *id001
diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml
index b73b1a4c4..8d68de02b 100644
--- a/zuul-tests.d/general-roles-jobs.yaml
+++ b/zuul-tests.d/general-roles-jobs.yaml
@@ -674,6 +674,15 @@
       - ^roles/generate-zuul-manifest/.*
       - ^test-playbooks/generate-zuul-manifest.yaml
 
+- job:
+    name: zuul-jobs-test-upload-artifactory
+    description: Test the upload-artifactory role
+    files:
+      - roles/upload-artifactory/.*
+      - test-playbooks/artifactory/.*
+    run: test-playbooks/artifactory/run.yaml
+    cleanup-run: test-playbooks/artifactory/cleanup.yaml
+
 - job:
     name: zuul-jobs-test-upload-git-mirror
     description: Test the upload-git-mirror role
@@ -734,6 +743,7 @@
         - zuul-jobs-test-multinode-roles-ubuntu-xenial-plain
         - zuul-jobs-test-multinode-roles-centos-8-plain
         - zuul-jobs-test-generate-zuul-manifest
+        - zuul-jobs-test-upload-artifactory
         - zuul-jobs-test-upload-git-mirror
     gate:
       jobs:
@@ -778,4 +788,5 @@
         - zuul-jobs-test-multinode-roles-ubuntu-xenial-plain
         - zuul-jobs-test-multinode-roles-centos-8-plain
         - zuul-jobs-test-generate-zuul-manifest
+        - zuul-jobs-test-upload-artifactory
         - zuul-jobs-test-upload-git-mirror