diff --git a/hledger/test/balance/commodity-column.test b/hledger/test/balance/layout.test
similarity index 91%
rename from hledger/test/balance/commodity-column.test
rename to hledger/test/balance/layout.test
index 5ad47096c..53b44f857 100644
--- a/hledger/test/balance/commodity-column.test
+++ b/hledger/test/balance/layout.test
@@ -9,8 +9,8 @@ $ hledger -f bcexample.hledger bal assets.*etrade -3 -O csv
 "total","70.00 GLD, 17.00 ITOT, 5120.50 USD, 36.00 VEA, 294.00 VHT"
 >=0
 
-# 2. Balance report csv output with one line per commodity (--commodity-column).
-$ hledger -f bcexample.hledger bal assets.*etrade -3 -O csv --commodity-column
+# 2. Balance report csv output with one line per commodity (--layout=bare).
+$ hledger -f bcexample.hledger bal assets.*etrade -3 -O csv --layout=bare
 >
 "account","commodity","balance"
 "Assets:US:ETrade","GLD","70.00"
@@ -42,7 +42,7 @@ $ hledger -f bcexample.hledger bal assets.*etrade -3
 >=0
 
 # 4. Balance report with commodity column.
-$ hledger -f bcexample.hledger bal assets.*etrade -3 --commodity-column
+$ hledger -f bcexample.hledger bal assets.*etrade -3 --layout=bare
 >
    70.00  GLD                    
    17.00  ITOT                   
@@ -65,8 +65,8 @@ $ hledger -f bcexample.hledger bal -T -Y assets.*etrade -3 -O csv
 "total","10.00 ITOT, 337.18 USD, 12.00 VEA, 106.00 VHT","70.00 GLD, 18.00 ITOT, -98.12 USD, 10.00 VEA, 18.00 VHT","-11.00 ITOT, 4881.44 USD, 14.00 VEA, 170.00 VHT","70.00 GLD, 17.00 ITOT, 5120.50 USD, 36.00 VEA, 294.00 VHT"
 >=0
 
-# 6. Multicolumn balance report csv output with --commodity-column.
-$ hledger -f bcexample.hledger bal -T -Y assets.*etrade -3 -O csv --commodity-column
+# 6. Multicolumn balance report csv output with --layout=bare.
+$ hledger -f bcexample.hledger bal -T -Y assets.*etrade -3 -O csv --layout=bare
 >
 "account","commodity","2012","2013","2014","total"
 "Assets:US:ETrade","GLD","0","70.00","0","70.00"
@@ -81,8 +81,8 @@ $ hledger -f bcexample.hledger bal -T -Y assets.*etrade -3 -O csv --commodity-co
 "total","VHT","106.00","18.00","170.00","294.00"
 >=0
 
-# 7. Multicolumn balance report with --commodity-column.
-$ hledger -f bcexample.hledger bal -Y assets.*etrade -3 --average --commodity-column --no-total
+# 7. Multicolumn balance report with --layout=bare.
+$ hledger -f bcexample.hledger bal -Y assets.*etrade -3 --average --layout=bare --no-total
 >
 Balance changes in 2012-01-01..2014-12-31:
 
@@ -95,8 +95,8 @@ Balance changes in 2012-01-01..2014-12-31:
  Assets:US:ETrade || VHT        106.00   18.00   170.00    98.00 
 >=0
 
-# 8. Multicolumn budget report csv output with --commodity-column.
-$ hledger -f bcexample.hledger bal -Y assets.*etrade -3 -O csv --commodity-column --budget
+# 8. Multicolumn budget report csv output with --layout=bare.
+$ hledger -f bcexample.hledger bal -Y assets.*etrade -3 -O csv --layout=bare --budget
 >
 "Account","Commodity","2012","budget","2013","budget","2014","budget"
 "<unbudgeted>","GLD","0","0","70.00","0","0","0"
@@ -111,7 +111,7 @@ $ hledger -f bcexample.hledger bal -Y assets.*etrade -3 -O csv --commodity-colum
 "Total:","VHT","106.00","0","18.00","0","170.00","0"
 >=0
 
-# 9. Multicolumn balance report with --commodity-column and null commodity
+# 9. Multicolumn balance report with --layout=bare and null commodity
 <
 2018/1/1
   (a)          1
@@ -120,7 +120,7 @@ $ hledger -f bcexample.hledger bal -Y assets.*etrade -3 -O csv --commodity-colum
 2018/1/2
   (a)          1 EUR
 
-$ hledger -f- bal -Y --commodity-column
+$ hledger -f- bal -Y --layout=bare
 Balance changes in 2018:
 
        || Commodity  2018 
@@ -133,8 +133,8 @@ Balance changes in 2018:
        || EUR           1 
 
 
-# 10. Multicolumn balance report with --commodity-column --transpose.
-$ hledger -f bcexample.hledger bal -Y assets.*etrade -1 --average --commodity-column --transpose
+# 10. Multicolumn balance report with --layout=bare --transpose.
+$ hledger -f bcexample.hledger bal -Y assets.*etrade -1 --average --layout=bare --transpose
 >
 Balance changes in 2012-01-01..2014-12-31:
 
@@ -147,7 +147,7 @@ Balance changes in 2012-01-01..2014-12-31:
  Average   ||  23.33    5.67  1706.83   12.00   98.00 | 23.33    5.67  1706.83  12.00   98.00 
 >=0
 
-# 11. Multicolumn budget report with --commodity-column --transpose.
+# 11. Multicolumn budget report with --layout=bare --transpose.
 <
 ~ daily from 2016/1/1
     expenses:food     $10
@@ -178,7 +178,7 @@ Balance changes in 2012-01-01..2014-12-31:
     expenses:cab  $15
     assets:cash
 
-$ hledger -f- bal --budget --commodity-column --transpose -DTN
+$ hledger -f- bal --budget --layout=bare --transpose -DTN
 >
 Budget performance in 2016-12-01..2016-12-03:
 
@@ -191,8 +191,8 @@ Budget performance in 2016-12-01..2016-12-03:
    Total    || -75 [100% of -75]  75 [100% of 75]  30 [100% of 30]     5 [11% of 45] 
 >=0
 
-# 12. Compound balance report output with --commodity-column.
-$ hledger -f bcexample.hledger bs -3 --commodity-column
+# 12. Compound balance report output with --layout=bare.
+$ hledger -f bcexample.hledger bs -3 --layout=bare
 >
 Balance Sheet 2014-10-11