diff --git a/tests/misc/account-aliases.test b/tests/account-aliases.test
similarity index 100%
rename from tests/misc/account-aliases.test
rename to tests/account-aliases.test
diff --git a/tests/accounts/sorting.test b/tests/accounts-sorting.test
similarity index 100%
rename from tests/accounts/sorting.test
rename to tests/accounts-sorting.test
diff --git a/tests/accounts/accounts.test b/tests/accounts.test
similarity index 100%
rename from tests/accounts/accounts.test
rename to tests/accounts.test
diff --git a/tests/add/add.test b/tests/add.test
similarity index 100%
rename from tests/add/add.test
rename to tests/add.test
diff --git a/tests/misc/amount-rendering.test b/tests/amount-rendering.test
similarity index 100%
rename from tests/misc/amount-rendering.test
rename to tests/amount-rendering.test
diff --git a/tests/budget/sorting.test b/tests/balance/budget-sorting.test
similarity index 100%
rename from tests/budget/sorting.test
rename to tests/balance/budget-sorting.test
diff --git a/tests/budget/budget.test b/tests/balance/budget.test
similarity index 100%
rename from tests/budget/budget.test
rename to tests/balance/budget.test
diff --git a/tests/balancesheet/balancesheet.test b/tests/balancesheet.test
similarity index 100%
rename from tests/balancesheet/balancesheet.test
rename to tests/balancesheet.test
diff --git a/tests/balancesheet/sample.journal b/tests/balancesheet/sample.journal
deleted file mode 100644
index ec7089075..000000000
--- a/tests/balancesheet/sample.journal
+++ /dev/null
@@ -1,40 +0,0 @@
-; A sample journal file.
-;
-; Sets up this account tree:
-; assets
-;   bank
-;     checking
-;     saving
-;   cash
-; expenses
-;   food
-;   supplies
-; income
-;   gifts
-;   salary
-; liabilities
-;   debts
-
-2008/01/01 income
-    assets:bank:checking  $1
-    income:salary
-
-2008/06/01 gift
-    assets:bank:checking  $1
-    income:gifts
-
-2008/06/02 save
-    assets:bank:saving  $1
-    assets:bank:checking
-
-2008/06/03 * eat & shop
-    expenses:food      $1
-    expenses:supplies  $1
-    assets:cash
-
-2008/12/31 * pay off
-    liabilities:debts  $1
-    assets:bank:checking
-
-
-;final comment
diff --git a/tests/cashflow/cashflow.test b/tests/cashflow.test
similarity index 100%
rename from tests/cashflow/cashflow.test
rename to tests/cashflow.test
diff --git a/tests/cashflow/sample.journal b/tests/cashflow/sample.journal
deleted file mode 100644
index ec7089075..000000000
--- a/tests/cashflow/sample.journal
+++ /dev/null
@@ -1,40 +0,0 @@
-; A sample journal file.
-;
-; Sets up this account tree:
-; assets
-;   bank
-;     checking
-;     saving
-;   cash
-; expenses
-;   food
-;   supplies
-; income
-;   gifts
-;   salary
-; liabilities
-;   debts
-
-2008/01/01 income
-    assets:bank:checking  $1
-    income:salary
-
-2008/06/01 gift
-    assets:bank:checking  $1
-    income:gifts
-
-2008/06/02 save
-    assets:bank:saving  $1
-    assets:bank:checking
-
-2008/06/03 * eat & shop
-    expenses:food      $1
-    expenses:supplies  $1
-    assets:cash
-
-2008/12/31 * pay off
-    liabilities:debts  $1
-    assets:bank:checking
-
-
-;final comment
diff --git a/tests/misc/close.test b/tests/close.test
similarity index 100%
rename from tests/misc/close.test
rename to tests/close.test
diff --git a/tests/csv/csv-read.test b/tests/csv.test
similarity index 100%
rename from tests/csv/csv-read.test
rename to tests/csv.test
diff --git a/tests/budget/forecast.test b/tests/forecast.test
similarity index 100%
rename from tests/budget/forecast.test
rename to tests/forecast.test
diff --git a/tests/incomestatement/incomestatement.test b/tests/incomestatement.test
similarity index 100%
rename from tests/incomestatement/incomestatement.test
rename to tests/incomestatement.test
diff --git a/tests/incomestatement/sample.journal b/tests/incomestatement/sample.journal
deleted file mode 100644
index ec7089075..000000000
--- a/tests/incomestatement/sample.journal
+++ /dev/null
@@ -1,40 +0,0 @@
-; A sample journal file.
-;
-; Sets up this account tree:
-; assets
-;   bank
-;     checking
-;     saving
-;   cash
-; expenses
-;   food
-;   supplies
-; income
-;   gifts
-;   salary
-; liabilities
-;   debts
-
-2008/01/01 income
-    assets:bank:checking  $1
-    income:salary
-
-2008/06/01 gift
-    assets:bank:checking  $1
-    income:gifts
-
-2008/06/02 save
-    assets:bank:saving  $1
-    assets:bank:checking
-
-2008/06/03 * eat & shop
-    expenses:food      $1
-    expenses:supplies  $1
-    assets:cash
-
-2008/12/31 * pay off
-    liabilities:debts  $1
-    assets:bank:checking
-
-
-;final comment
diff --git a/tests/misc/pivot.test b/tests/pivot.test
similarity index 100%
rename from tests/misc/pivot.test
rename to tests/pivot.test
diff --git a/tests/misc/prices.test b/tests/prices.test
similarity index 98%
rename from tests/misc/prices.test
rename to tests/prices.test
index 32e8b6295..9956b6783 100644
--- a/tests/misc/prices.test
+++ b/tests/prices.test
@@ -1,5 +1,3 @@
-# Test prices addon
-
 # by default only market prices are reported
 hledger prices -f-
 <<<
diff --git a/tests/misc/rewrite.test b/tests/rewrite.test
similarity index 99%
rename from tests/misc/rewrite.test
rename to tests/rewrite.test
index 058312da0..5e60da0aa 100644
--- a/tests/misc/rewrite.test
+++ b/tests/rewrite.test
@@ -1,5 +1,3 @@
-# Tests for rewrite addon
-
 # Add proportional income tax (from documentation)
 hledger rewrite -f- ^income --add-posting '(liabilities:tax)  *.33  ; income tax'
 <<<
diff --git a/tests/misc/roi.test b/tests/roi.test
similarity index 100%
rename from tests/misc/roi.test
rename to tests/roi.test
diff --git a/tests/sample.journal b/tests/sample.journal
new file mode 120000
index 000000000..620947e07
--- /dev/null
+++ b/tests/sample.journal
@@ -0,0 +1 @@
+../examples/sample.journal
\ No newline at end of file
diff --git a/tests/stats/stats.test b/tests/stats.test
similarity index 100%
rename from tests/stats/stats.test
rename to tests/stats.test
diff --git a/tests/timeclock/timeclock.test b/tests/timeclock.test
similarity index 83%
rename from tests/timeclock/timeclock.test
rename to tests/timeclock.test
index 992ddc512..6bb719ba4 100644
--- a/tests/timeclock/timeclock.test
+++ b/tests/timeclock.test
@@ -110,3 +110,26 @@ o 2009/1/3 09:00:00
 #               $262.5  Receivable:Consulting:XXXX
 # --------------------
 #               $262.5  
+
+# # timezone-related tests
+# # 1. as in ledger, historical prices may contain a time and timezone.
+# # hledger ignores them and uses 00:00 local time instead.
+# # XXX needs --value not --cost
+# hledgerdev -f - balance --no-total --cost
+# <<<
+# P 2011/01/01 00:00:00      A $1
+# P 2011/01/01 15:00:00-0100 A $2
+
+# 2010/12/31
+#   (20101231)  1 A
+
+# 2011/1/1
+#   (20110101)  1 A
+
+# 2011/1/2
+#   (20110102)  1 A
+# >>>
+#                  1 A  20101231
+#                   $2  20110101
+#                   $2  20110102
+# >>>=0
diff --git a/tests/timeclock/timezone.test.notimplemented b/tests/timeclock/timezone.test.notimplemented
deleted file mode 100644
index bc700010c..000000000
--- a/tests/timeclock/timezone.test.notimplemented
+++ /dev/null
@@ -1,22 +0,0 @@
-# timezone-related tests
-# 1. as in ledger, historical prices may contain a time and timezone.
-# hledger ignores them and uses 00:00 local time instead.
-# XXX needs --value not --cost
-hledgerdev -f - balance --no-total --cost
-<<<
-P 2011/01/01 00:00:00      A $1
-P 2011/01/01 15:00:00-0100 A $2
-
-2010/12/31
-  (20101231)  1 A
-
-2011/1/1
-  (20110101)  1 A
-
-2011/1/2
-  (20110102)  1 A
->>>
-                 1 A  20101231
-                  $2  20110101
-                  $2  20110102
->>>=0