diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 489ac476784..7177d3b5c44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -181,11 +181,7 @@ samba-admem-mit:
 samba-ad-dc-4-mitkrb5:
   extends: .shared_template
 
-samba-ad-dc-fips:
-  extends: .shared_template
-  image: $SAMBA_CI_CONTAINER_IMAGE_fedora31
-
-samba-admem-fips:
+samba-fips:
   extends: .shared_template
   image: $SAMBA_CI_CONTAINER_IMAGE_fedora31
 
@@ -253,7 +249,7 @@ pages:
     - samba-nt4
     - samba-schemaupgrade
     - samba-ad-dc-1-mitkrb5
-    - samba-ad-dc-fips
+    - samba-fips
   script:
     - ./configure.developer
     - make -j
diff --git a/script/autobuild.py b/script/autobuild.py
index 840ed4e9648..1d63111f992 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -458,11 +458,11 @@ tasks = {
         ],
 
     # Test fips compliance
-    "samba-ad-dc-fips": [
-        ("random-sleep", random_sleep(1, 1)),
+    "samba-fips": [
+        ("random-sleep", random_sleep(100, 500)),
         ("configure", "./configure.developer --with-selftest-prefix=./bin/ab --with-system-mitkrb5 --with-experimental-mit-ad-dc" + samba_configure_params),
         ("make", "make -j"),
-        ("test", make_test(include_envs=["ad_dc_fips"])),
+        ("test", make_test(include_envs=["ad_dc_fips", "ad_member_fips"])),
         ("lcov", LCOV_CMD),
         ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
@@ -499,17 +499,6 @@ tasks = {
         ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
-    "samba-admem-fips": [
-        ("random-sleep", random_sleep(1, 1)),
-        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab --with-system-mitkrb5 --with-experimental-mit-ad-dc" + samba_configure_params),
-        ("make", "make -j"),
-        ("test", make_test(include_envs=[
-            "ad_member_fips",
-            ])),
-        ("lcov", LCOV_CMD),
-        ("check-clean-tree", "script/clean-source-tree.sh"),
-        ],
-
     "samba-ad-dc-1-mitkrb5": [
         ("random-sleep", random_sleep(1, 1)),
         ("configure", "./configure.developer --with-selftest-prefix=./bin/ab --with-system-mitkrb5 --with-experimental-mit-ad-dc" + samba_configure_params),
@@ -838,8 +827,7 @@ defaulttasks.remove("pass")
 defaulttasks.remove("fail")
 defaulttasks.remove("samba-test-only")
 defaulttasks.remove("samba-fuzz")
-defaulttasks.remove("samba-ad-dc-fips")
-defaulttasks.remove("samba-admem-fips")
+defaulttasks.remove("samba-fips")
 if os.environ.get("AUTOBUILD_SKIP_SAMBA_O3", "0") == "1":
     defaulttasks.remove("samba-o3")