diff --git a/hledger/test/journal/directives-account.test b/hledger/test/journal/directive-account.test
similarity index 100%
rename from hledger/test/journal/directives-account.test
rename to hledger/test/journal/directive-account.test
diff --git a/hledger/test/journal/directive-commodity.test b/hledger/test/journal/directive-commodity.test
new file mode 100644
index 000000000..35ea6833a
--- /dev/null
+++ b/hledger/test/journal/directive-commodity.test
@@ -0,0 +1,13 @@
+# commodity directive
+<
+commodity BTC
+$ hledger -f - reg
+
+# commodity directive with subdirective
+<
+commodity BTC
+  note Bitcoin
+$ hledger -f - reg
+>2 /expecting "format"/
+>=1
+
diff --git a/hledger/test/journal/default-commodity.test b/hledger/test/journal/directive-default-commodity.test
similarity index 100%
rename from hledger/test/journal/default-commodity.test
rename to hledger/test/journal/directive-default-commodity.test
diff --git a/hledger/test/journal/directives.test b/hledger/test/journal/directives.test
index 334c005fb..39fba6ddc 100644
--- a/hledger/test/journal/directives.test
+++ b/hledger/test/journal/directives.test
@@ -1,3 +1,5 @@
+# Miscellaneous directives not tested elsewhere
+
 # apply account, end apply account directives
 <
 apply account a
@@ -16,16 +18,3 @@ a:b
 aa:b
 c
 
-# commodity directive
-<
-commodity BTC
-$ hledger -f - reg
-
-# commodity directive with subdirective
-<
-commodity BTC
-  note Bitcoin
-$ hledger -f - reg
->2 /expecting "format"/
->=1
-