diff --git a/tests/M00.conf b/tests/M00.conf
new file mode 100644
index 00000000..40b77b64
--- /dev/null
+++ b/tests/M00.conf
@@ -0,0 +1,3 @@
+ENABLED=true
+PREINSTALL="bash bin/armbian-configng --cmd M01"
+CONDITION="[ ! dpkg -l | grep cockpit ]"
diff --git a/tests/M01.conf b/tests/M01.conf
new file mode 100644
index 00000000..77d82846
--- /dev/null
+++ b/tests/M01.conf
@@ -0,0 +1,3 @@
+ENABLED=true
+PREINSTALL="bash bin/armbian-configng --cmd M00"
+CONDITION="[ dpkg -l | grep cockpit ]"
\ No newline at end of file
diff --git a/tests/S17.conf b/tests/S17.conf
deleted file mode 100644
index 12b75eca..00000000
--- a/tests/S17.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-ENABLED=true
-PREINSTALL="bash bin/armbian-configng --cmd S18"
-CONDITION="[ ! -f /usr/bin/zsh ]"
diff --git a/tests/S18.conf b/tests/S18.conf
deleted file mode 100644
index bea6f840..00000000
--- a/tests/S18.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-ENABLED=true
-CONDITION="[ -f /usr/bin/zsh ]"