diff --git a/tests/selinuxtest.py b/tests/selinuxtest.py
index 1e04813..e4d655b 100755
--- a/tests/selinuxtest.py
+++ b/tests/selinuxtest.py
@@ -108,6 +108,7 @@ def bool_state_to_id(state, was = False):
 
 
 def bools_test():
+	report(INFO, 0, "Starting booleans change test")
 	old_fname = os.path.join(testenv['TDATA_DIR'], testenv['OLDBOOLS_FILE'])
 	bools = get_bools()
 	testname = testenv['NAME']
@@ -134,16 +135,16 @@ def get_msgtype(str):
 	if str == 'HINT'   : return HINT
 	
 def enabled_test():
-	mode = cmd.getoutput('getenforce')
-	if mode != testenv['MODE'] and mode != 'Enforcing':
+	(status, mode) = cmd.getstatusoutput('getenforce')
+	if status != 0 or (mode != testenv['MODE'] and mode != 'Enforcing'):
+		if (mode == ''): mode = 'disabled'
 		report(get_msgtype(testenv['DISABLED_MSGTYPE']), ID_ENABLED, "Selinux is in " + mode + " mode.")
 		report(HINT, ID_ENABLED, "Using Enforing mode is highly recommended. See selinux manual page for switching to Enforcing mode.")
 
 	
 def main():
-	report(INFO, 0, "Starting booleans change test")
-	bools_test()
 	enabled_test()
+	if se.is_selinux_enabled(): bools_test()
 
 if __name__ == '__main__':
 	main()