diff --git a/tests/p_setup/group_file_test.sh b/tests/p_setup/group_file_test.sh
new file mode 100755
index 0000000..4bb9f53
--- /dev/null
+++ b/tests/p_setup/group_file_test.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Author: Athmane Madjoudj <athmanem@gmail.com>
+
+t_Log "Running $0 - group file sanity check."
+
+grep -q 'root:x:0' /etc/group && \
+grep -q 'bin:x:1' /etc/group && \
+grep -q 'daemon:x:2' /etc/group && \
+grep -q 'nobody:x:99' /etc/group 
+
+
+t_CheckExitStatus $?
diff --git a/tests/p_setup/passwd_file_test.sh b/tests/p_setup/passwd_file_test.sh
new file mode 100755
index 0000000..df21a16
--- /dev/null
+++ b/tests/p_setup/passwd_file_test.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Author: Athmane Madjoudj <athmanem@gmail.com>
+
+t_Log "Running $0 - passwd file sanity check."
+
+grep -q 'root:x:0' /etc/passwd && \
+grep -q 'nobody:x:99' /etc/passwd
+
+
+t_CheckExitStatus $?