diff --git a/Makefile.am b/Makefile.am
index 70624560cb1f067cbf19b047413f1e7fa9c055c9..4f7a772454e7d77610bdbf391584bcf8a46b2652 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,8 @@ TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 TESTS = \
 	t/01compile.t \
 	t/02critic.t \
-	t/account-manager.cgi.t \
-	t/account-manager.t \
+	t/cgi.t \
+	t/cli.t \
 	t/metadata.t \
 	t/tools.t
 
diff --git a/t/account-manager.cgi.t b/t/cgi.t
similarity index 100%
rename from t/account-manager.cgi.t
rename to t/cgi.t
diff --git a/t/account-manager.t b/t/cli.t
similarity index 100%
rename from t/account-manager.t
rename to t/cli.t