diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 78e7d6f4fdb..7cd86689184 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -589,12 +589,7 @@ PHP_FUNCTION(mcrypt_enc_get_supported_key_sizes)
 PHP_FUNCTION(mcrypt_enc_self_test)
 {
 	MCRYPT_GET_TD_ARG
-
-	if (mcrypt_enc_self_test(pm->td) == 0) {
-		RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
+	RETURN_LONG(mcrypt_enc_self_test(pm->td));
 }
 /* }}} */
 
diff --git a/ext/mcrypt/tests/mcrypt_enc_self_test.phpt b/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
index 54ce213de2d..a161e0e02be 100644
--- a/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
@@ -7,4 +7,4 @@ mcrypt_enc_self_test
 $td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
 var_dump(mcrypt_enc_self_test($td));
 --EXPECT--
-bool(true)
+int(0)
\ No newline at end of file