diff --git a/Dockerfile b/Dockerfile
index 125a5f654..f0e647de4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1 +1 @@
-FROM plus3it/tardigrade-ci:0.24.7
+FROM plus3it/tardigrade-ci:0.25.2
diff --git a/_modules/ash_linux.py b/_modules/ash_linux.py
index a57d5be22..b0cbe952e 100644
--- a/_modules/ash_linux.py
+++ b/_modules/ash_linux.py
@@ -149,7 +149,7 @@ def _rollback_fips_disable(installed_fips_pkgs):
     __salt__["cmd.run"]("grubby --update-kernel=ALL --args=fips=1", python_shell=False)
 
 
-def fips_disable():  # pylint: disable=too-many-branches
+def fips_disable():  # pylint: disable=too-many-branches,inconsistent-return-statements
     """
     Disables FIPS on RH/CentOS system.
 
@@ -212,7 +212,7 @@ def fips_disable():  # pylint: disable=too-many-branches
         if "changes" not in ret and "comment" not in ret:
             ret["comment"] = "FIPS mode is already disabled. No changes."
     finally:
-        return ret  # pylint: disable=lost-exception
+        return ret  # pylint: disable=lost-exception,return-in-finally
 
 
 def _rollback_fips_enable():
@@ -231,7 +231,7 @@ def _rollback_fips_enable():
     )
 
 
-def fips_enable():  # pylint: disable=too-many-branches
+def fips_enable():  # pylint: disable=too-many-branches,inconsistent-return-statements
     """
     Enable FIPS on RH/CentOS system.
 
@@ -296,7 +296,7 @@ def fips_enable():  # pylint: disable=too-many-branches
         if "changes" not in ret and "comment" not in ret:
             ret["comment"] = "FIPS mode is already enabled. No changes."
     finally:
-        return ret  # pylint: disable=lost-exception
+        return ret  # pylint: disable=lost-exception,return-in-finally
 
 
 def fips_status():
diff --git a/tests/docker/centos7/Dockerfile b/tests/docker/centos7/Dockerfile
deleted file mode 100644
index cc4c24f4f..000000000
--- a/tests/docker/centos7/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM quay.io/centos/centos:centos7@sha256:e4ca2ed0202e76be184e75fb26d14bf974193579039d5573fb2348664deef76e
-
-
-CMD ["/bin/bash"]
diff --git a/tests/docker/centos8/Dockerfile b/tests/docker/centos8/Dockerfile
deleted file mode 100644
index d255ce9eb..000000000
--- a/tests/docker/centos8/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM quay.io/centos/centos:stream8@sha256:20da069d4f8126c4517ee563e6e723d4cbe79ff62f6c4597f753478af91a09a3
-
-
-CMD ["/bin/bash"]
diff --git a/tests/requirements-el7.txt b/tests/requirements-el7.txt
deleted file mode 100644
index f79ed15cf..000000000
--- a/tests/requirements-el7.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-grub2
-postfix
-sudo
diff --git a/tests/requirements-el8.txt b/tests/requirements-el8.txt
deleted file mode 100644
index e69de29bb..000000000