diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt
index 73e5fd2e4..a8f622955 100644
--- a/maxscale-system-test/CMakeLists.txt
+++ b/maxscale-system-test/CMakeLists.txt
@@ -94,16 +94,16 @@ add_test_script(bug562.sh bug562.sh replication LABELS MySQLAuth REPL_BACKEND)
 add_test_script(bug564.sh bug564.sh replication LABELS MySQLProtocol REPL_BACKEND)
 
 # Regression case for the bug "Clients CLIENT_FOUND_ROWS setting is ignored by maxscale"
-add_test_executable(bug565.cpp bug565 replication LABELS MySQLProtocol REPL_BACKEND)
+add_test_executable(mariadb_client_found_rows.cpp mariadb_client_found_rows replication LABELS MySQLProtocol REPL_BACKEND)
 
 # Regression case for the bug "Crash if files from /dev/shm/ removed"
 add_test_script(bug567.sh bug567.sh bug567 LABELS maxscale REPL_BACKEND)
 
 # Regression case for the bug "Using regex filter hangs MaxScale"
-add_test_executable(bug571.cpp bug571 bug571 LABELS regexfilter REPL_BACKEND)
+add_test_executable(regexf_replace.cpp regexf_replace regexf_replace LABELS regexfilter REPL_BACKEND)
 
 # Attempt to use GRANT with wrong IP, expect no crash or hangs
-add_test_executable(bug572.cpp bug572 replication LABELS readwritesplit REPL_BACKEND)
+add_test_executable(auth_fail_crash.cpp auth_fail_crash replication LABELS readwritesplit REPL_BACKEND)
 
 # Regression cases for the bug "Hint filter don't work if listed before regex filter in configuration file"
 # (different filter sequence and configuration, but the same test, see .cnf for details)
@@ -112,43 +112,43 @@ add_test_executable(bug587.cpp bug587 bug587 LABELS regexfilter hintfilter REPL_
 add_test_derived(bug587_1 bug587 bug587_1 LABELS regexfilter hintfilter REPL_BACKEND)
 
 # Tries to connect Maxscale when all slaves stopped
-add_test_executable(bug592.cpp bug592 replication LABELS MySQLAuth readwritesplit REPL_BACKEND)
+add_test_executable(auth_users_from_master.cpp auth_users_from_master replication LABELS MySQLAuth readwritesplit REPL_BACKEND)
 
 # Tries to do change user in the loop, checks that autorization is still ok
-add_test_executable(bug601.cpp bug601 bug601 LABELS MySQLAuth MySQLProtocol REPL_BACKEND)
+add_test_executable(auth_change_user_loop.cpp auth_change_user_loop auth_change_user_loop LABELS MySQLAuth MySQLProtocol REPL_BACKEND)
 
 # Simple test with enable_root_user=true
-add_test_executable(bug620.cpp bug620 bug620 LABELS MySQLAuth MySQLProtocol REPL_BACKEND)
+add_test_executable(auth_enable_root.cpp auth_enable_root auth_enable_root LABELS MySQLAuth MySQLProtocol REPL_BACKEND)
 
 # Regression case for the bug "Crash when user define with old password style (before 4.1 protocol)"
-add_test_executable(bug626.cpp bug626 replication LABELS MySQLAuth MySQLProtocol REPL_BACKEND)
+add_test_executable(auth_old_pw.cpp auth_old_pw replication LABELS MySQLAuth MySQLProtocol REPL_BACKEND)
 
 # Crash when host name for some user in mysql.user is very long
-add_test_executable(bug653.cpp bug653 replication LABELS MySQLAuth MySQLProtocol REPL_BACKEND)
+add_test_executable(auth_long_hostname.cpp auth_long_hostname replication LABELS MySQLAuth MySQLProtocol REPL_BACKEND)
 
 # Crash with malformed Maxadmin command
-add_test_executable(bug654.cpp bug654 replication LABELS maxscale REPL_BACKEND)
+add_test_executable(maxadmin_cmd_crash.cpp maxadmin_cmd_crash replication LABELS maxscale REPL_BACKEND)
 
 # Block backends (master or all slaves) and tries to connect Maxscale
-add_test_executable(bug658.cpp bug658 replication LABELS readwritesplit readconnroute maxscale REPL_BACKEND)
+add_test_executable(no_backends_crash.cpp no_backends_crash replication LABELS readwritesplit readconnroute maxscale REPL_BACKEND)
 
 # Block all backends
-add_test_executable(bug662.cpp bug662 bug662 LABELS readwritesplit readconnroute maxscale REPL_BACKEND)
+add_test_executable(startup_fail_no_servers.cpp startup_fail_no_servers startup_fail_no_servers LABELS readwritesplit readconnroute maxscale REPL_BACKEND)
 
 # Bad TEE filter configuration
-add_test_executable(bug664.cpp bug664 bug664 LABELS MySQLAuth MySQLProtocol REPL_BACKEND)
+add_test_executable(teef_no_master.cpp teef_no_master teef_no_master LABELS MySQLAuth MySQLProtocol REPL_BACKEND)
 
 # Regression case for the bug "MaxScale crashes if "Users table data" is empty and "show dbusers" is executed in maxadmin"
-add_test_executable(bug673.cpp bug673 bug673 LABELS MySQLAuth REPL_BACKEND)
+add_test_executable(maxadmin_show_users_crash.cpp maxadmin_show_users_crash maxadmin_show_users_crash LABELS MySQLAuth REPL_BACKEND)
 
 # Wrong processing of 'SET GLOBAL sql_mode="ANSI"'
-add_test_executable(bug705.cpp bug705 bug705 LABELS MySQLAuth REPL_BACKEND)
+add_test_executable(auth_sqlmode_ansi.cpp auth_sqlmode_ansi auth_sqlmode_ansi LABELS MySQLAuth REPL_BACKEND)
 
 # Prepared statement from PHP application
-add_test_executable(bug729.cpp bug729 replication LABELS readwritesplit LIGHT REPL_BACKEND)
+add_test_executable(rwsplit_php_stmt.cpp rwsplit_php_stmt replication LABELS readwritesplit LIGHT REPL_BACKEND)
 
 # Regression case for the bug "Regex filter and shorter than original replacement queries MaxScale" (crash)
-add_test_executable(bug730.cpp bug730 bug730 LABELS regexfilter REPL_BACKEND)
+add_test_executable(regexf_replace_crash.cpp regexf_replace_crash regexf_replace_crash LABELS regexfilter REPL_BACKEND)
 
 # Test MariaDB 10.2 bulk inserts
 add_test_executable(bulk_insert.cpp bulk_insert bulk_insert LABELS MySQLProtocol REPL_BACKEND 10.2)
diff --git a/maxscale-system-test/bug601.cpp b/maxscale-system-test/auth_change_user_loop.cpp
similarity index 100%
rename from maxscale-system-test/bug601.cpp
rename to maxscale-system-test/auth_change_user_loop.cpp
diff --git a/maxscale-system-test/bug620.cpp b/maxscale-system-test/auth_enable_root.cpp
similarity index 100%
rename from maxscale-system-test/bug620.cpp
rename to maxscale-system-test/auth_enable_root.cpp
diff --git a/maxscale-system-test/bug572.cpp b/maxscale-system-test/auth_fail_crash.cpp
similarity index 100%
rename from maxscale-system-test/bug572.cpp
rename to maxscale-system-test/auth_fail_crash.cpp
diff --git a/maxscale-system-test/bug653.cpp b/maxscale-system-test/auth_long_hostname.cpp
similarity index 100%
rename from maxscale-system-test/bug653.cpp
rename to maxscale-system-test/auth_long_hostname.cpp
diff --git a/maxscale-system-test/bug626.cpp b/maxscale-system-test/auth_old_pw.cpp
similarity index 100%
rename from maxscale-system-test/bug626.cpp
rename to maxscale-system-test/auth_old_pw.cpp
diff --git a/maxscale-system-test/bug705.cpp b/maxscale-system-test/auth_sqlmode_ansi.cpp
similarity index 100%
rename from maxscale-system-test/bug705.cpp
rename to maxscale-system-test/auth_sqlmode_ansi.cpp
diff --git a/maxscale-system-test/bug592.cpp b/maxscale-system-test/auth_users_from_master.cpp
similarity index 100%
rename from maxscale-system-test/bug592.cpp
rename to maxscale-system-test/auth_users_from_master.cpp
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug601 b/maxscale-system-test/cnf/maxscale.cnf.template.auth_change_user_loop
similarity index 100%
rename from maxscale-system-test/cnf/maxscale.cnf.template.bug601
rename to maxscale-system-test/cnf/maxscale.cnf.template.auth_change_user_loop
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug620 b/maxscale-system-test/cnf/maxscale.cnf.template.auth_enable_root
similarity index 100%
rename from maxscale-system-test/cnf/maxscale.cnf.template.bug620
rename to maxscale-system-test/cnf/maxscale.cnf.template.auth_enable_root
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug705 b/maxscale-system-test/cnf/maxscale.cnf.template.auth_sqlmode_ansi
similarity index 100%
rename from maxscale-system-test/cnf/maxscale.cnf.template.bug705
rename to maxscale-system-test/cnf/maxscale.cnf.template.auth_sqlmode_ansi
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug673 b/maxscale-system-test/cnf/maxscale.cnf.template.maxadmin_show_users_crash
similarity index 100%
rename from maxscale-system-test/cnf/maxscale.cnf.template.bug673
rename to maxscale-system-test/cnf/maxscale.cnf.template.maxadmin_show_users_crash
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug571 b/maxscale-system-test/cnf/maxscale.cnf.template.regexf_replace
similarity index 100%
rename from maxscale-system-test/cnf/maxscale.cnf.template.bug571
rename to maxscale-system-test/cnf/maxscale.cnf.template.regexf_replace
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug730 b/maxscale-system-test/cnf/maxscale.cnf.template.regexf_replace_crash
similarity index 100%
rename from maxscale-system-test/cnf/maxscale.cnf.template.bug730
rename to maxscale-system-test/cnf/maxscale.cnf.template.regexf_replace_crash
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug662 b/maxscale-system-test/cnf/maxscale.cnf.template.startup_fail_no_servers
similarity index 100%
rename from maxscale-system-test/cnf/maxscale.cnf.template.bug662
rename to maxscale-system-test/cnf/maxscale.cnf.template.startup_fail_no_servers
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug664 b/maxscale-system-test/cnf/maxscale.cnf.template.teef_no_master
similarity index 100%
rename from maxscale-system-test/cnf/maxscale.cnf.template.bug664
rename to maxscale-system-test/cnf/maxscale.cnf.template.teef_no_master
diff --git a/maxscale-system-test/bug565.cpp b/maxscale-system-test/mariadb_client_found_rows.cpp
similarity index 100%
rename from maxscale-system-test/bug565.cpp
rename to maxscale-system-test/mariadb_client_found_rows.cpp
diff --git a/maxscale-system-test/bug654.cpp b/maxscale-system-test/maxadmin_cmd_crash.cpp
similarity index 100%
rename from maxscale-system-test/bug654.cpp
rename to maxscale-system-test/maxadmin_cmd_crash.cpp
diff --git a/maxscale-system-test/bug673.cpp b/maxscale-system-test/maxadmin_show_users_crash.cpp
similarity index 100%
rename from maxscale-system-test/bug673.cpp
rename to maxscale-system-test/maxadmin_show_users_crash.cpp
diff --git a/maxscale-system-test/bug658.cpp b/maxscale-system-test/no_backends_crash.cpp
similarity index 100%
rename from maxscale-system-test/bug658.cpp
rename to maxscale-system-test/no_backends_crash.cpp
diff --git a/maxscale-system-test/bug571.cpp b/maxscale-system-test/regexf_replace.cpp
similarity index 100%
rename from maxscale-system-test/bug571.cpp
rename to maxscale-system-test/regexf_replace.cpp
diff --git a/maxscale-system-test/bug730.cpp b/maxscale-system-test/regexf_replace_crash.cpp
similarity index 100%
rename from maxscale-system-test/bug730.cpp
rename to maxscale-system-test/regexf_replace_crash.cpp
diff --git a/maxscale-system-test/bug729.cpp b/maxscale-system-test/rwsplit_php_stmt.cpp
similarity index 98%
rename from maxscale-system-test/bug729.cpp
rename to maxscale-system-test/rwsplit_php_stmt.cpp
index 2ccc9ae99..b7133f38d 100644
--- a/maxscale-system-test/bug729.cpp
+++ b/maxscale-system-test/rwsplit_php_stmt.cpp
@@ -69,7 +69,7 @@ int main(int argc, char* argv[])
     char str[4096 + 1024];
 
     sprintf(str,
-            "php %s/bug729.php %s %d %s %s",
+            "php %s/rwsplit_php_stmt.php %s %d %s %s",
             test_dir,
             Test->maxscales->IP[0],
             Test->maxscales->rwsplit_port[0],
diff --git a/maxscale-system-test/bug729.php b/maxscale-system-test/rwsplit_php_stmt.php
similarity index 100%
rename from maxscale-system-test/bug729.php
rename to maxscale-system-test/rwsplit_php_stmt.php
diff --git a/maxscale-system-test/bug662.cpp b/maxscale-system-test/startup_fail_no_servers.cpp
similarity index 100%
rename from maxscale-system-test/bug662.cpp
rename to maxscale-system-test/startup_fail_no_servers.cpp
diff --git a/maxscale-system-test/bug664.cpp b/maxscale-system-test/teef_no_master.cpp
similarity index 100%
rename from maxscale-system-test/bug664.cpp
rename to maxscale-system-test/teef_no_master.cpp