diff --git a/tests/r_lamp/0_lamp_install.sh b/tests/r_lamp/0_lamp_install.sh
index ca4b8b3..ece6bbe 100755
--- a/tests/r_lamp/0_lamp_install.sh
+++ b/tests/r_lamp/0_lamp_install.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 # Author: Steve Barnes (steve@echo.id.au)
+#	  Christoph Galuschka <christoph.galuschka@chello.at>
+
+t_Log "Running $0 - attempting to install LAMP stack."
 
 t_InstallPackage httpd mysql-server php
 t_ServiceControl httpd restart
diff --git a/tests/r_lamp/1_lamp_check.sh b/tests/r_lamp/1_lamp_check.sh
index b6a05ee..9d0a7a0 100755
--- a/tests/r_lamp/1_lamp_check.sh
+++ b/tests/r_lamp/1_lamp_check.sh
@@ -63,4 +63,6 @@ if [ $RETVAL -ne 0 ]; then
 	t_Log "FAIL: php_info() check failed ($RETVAL)"
 	exit $FAIL
 
-fi
\ No newline at end of file
+fi
+
+t_CheckExitStatus $RETVAL
diff --git a/tests/r_lamp/40_basic_lamp.sh b/tests/r_lamp/40_basic_lamp.sh
index c3a2e49..ac2449b 100755
--- a/tests/r_lamp/40_basic_lamp.sh
+++ b/tests/r_lamp/40_basic_lamp.sh
@@ -51,9 +51,9 @@ mysql -u root -e 'drop database qatests;'
 service httpd stop
 
 if [ "$content" = "mysqltest" ] ; then
-	t_Log PASS;
-	exit 0;
+	ret_val=0;
 else
-	t_Log FAIL;
-	exit 1;
+	ret_val=1;
 fi
+
+t_CheckExitStatus $ret_val