diff --git a/lib/armbian-configng/config.ng.software.sh b/lib/armbian-configng/config.ng.software.sh
index 0aaadd959..13d8874da 100644
--- a/lib/armbian-configng/config.ng.software.sh
+++ b/lib/armbian-configng/config.ng.software.sh
@@ -101,7 +101,6 @@ install_docker() {
 			fi
 			systemctl enable docker.service > /dev/null 2>&1
 			systemctl enable containerd.service > /dev/null 2>&1
-			sudo usermod -aG docker $USER > /dev/null 2>&1
 			whiptail --msgbox "To test that Docker has installed successfully\nrun the following command: docker run hello-world" 9 70
 		fi
 	else
diff --git a/tests/SW25.conf b/tests/SW25.conf
new file mode 100644
index 000000000..4f045d658
--- /dev/null
+++ b/tests/SW25.conf
@@ -0,0 +1,2 @@
+ENABLED=true
+CONDITION="docker run hello-world"