diff --git a/test/ocf/ocf.sh b/test/ocf/ocf.sh
index 9125766d1..281bfaa66 100755
--- a/test/ocf/ocf.sh
+++ b/test/ocf/ocf.sh
@@ -5,17 +5,12 @@ rootdir=$(readlink -f $testdir/../..)
 
 source $rootdir/test/common/autotest_common.sh
 
-function suite()
-{
-	run_test "ocf_$(basename "$@")" "$@"
-}
-
-suite "$testdir/integrity/fio-modes.sh"
-suite "$testdir/integrity/bdevperf-iotypes.sh"
-suite "$testdir/integrity/stats.sh"
-suite "$testdir/management/create-destruct.sh"
-suite "$testdir/management/multicore.sh"
-suite "$testdir/management/persistent-metadata.sh"
-suite "$testdir/management/remove.sh"
+run_test "ocf_fio_modes" "$testdir/integrity/fio-modes.sh"
+run_test "ocf_bdevperf_iotypes" "$testdir/integrity/bdevperf-iotypes.sh"
+run_test "ocf_stats" "$testdir/integrity/stats.sh"
+run_test "ocf_create_destruct" "$testdir/management/create-destruct.sh"
+run_test "ocf_multicore" "$testdir/management/multicore.sh"
+run_test "ocf_persistent_metadata" "$testdir/management/persistent-metadata.sh"
+run_test "ocf_remove" "$testdir/management/remove.sh"
 
 report_test_completion "ocf"