diff --git a/tests/functional/disapprove_test.php b/tests/functional/visibility_disapprove_test.php
similarity index 99%
rename from tests/functional/disapprove_test.php
rename to tests/functional/visibility_disapprove_test.php
index ea594b1062..ca6f6f5f37 100644
--- a/tests/functional/disapprove_test.php
+++ b/tests/functional/visibility_disapprove_test.php
@@ -10,7 +10,7 @@
 /**
 * @group functional
 */
-class phpbb_functional_disapprove_test extends phpbb_functional_test_case
+class phpbb_functional_visibility_disapprove_test extends phpbb_functional_test_case
 {
 	protected $data = array();
 
diff --git a/tests/functional/softdelete_test.php b/tests/functional/visibility_softdelete_test.php
similarity index 99%
rename from tests/functional/softdelete_test.php
rename to tests/functional/visibility_softdelete_test.php
index 1c86d00b9b..f8ada9687c 100644
--- a/tests/functional/softdelete_test.php
+++ b/tests/functional/visibility_softdelete_test.php
@@ -10,7 +10,7 @@
 /**
 * @group functional
 */
-class phpbb_functional_softdelete_test extends phpbb_functional_test_case
+class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_case
 {
 	protected $data = array();