diff --git a/tests/fixtures/generic/mdadm/examine-raid0-offline b/tests/fixtures/generic/mdadm-examine-raid0-offline.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid0-offline
rename to tests/fixtures/generic/mdadm-examine-raid0-offline.out
diff --git a/tests/fixtures/generic/mdadm/examine-raid0-ok b/tests/fixtures/generic/mdadm-examine-raid0-ok.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid0-ok
rename to tests/fixtures/generic/mdadm-examine-raid0-ok.out
diff --git a/tests/fixtures/generic/mdadm/examine-raid1-0.90-ok b/tests/fixtures/generic/mdadm-examine-raid1-0-90-ok.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid1-0.90-ok
rename to tests/fixtures/generic/mdadm-examine-raid1-0-90-ok.out
diff --git a/tests/fixtures/generic/mdadm/examine-raid1-checking b/tests/fixtures/generic/mdadm-examine-raid1-checking.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid1-checking
rename to tests/fixtures/generic/mdadm-examine-raid1-checking.out
diff --git a/tests/fixtures/generic/mdadm/examine-raid1-failfast b/tests/fixtures/generic/mdadm-examine-raid1-failfast.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid1-failfast
rename to tests/fixtures/generic/mdadm-examine-raid1-failfast.out
diff --git a/tests/fixtures/generic/mdadm/examine-raid1-faulty1 b/tests/fixtures/generic/mdadm-examine-raid1-faulty1.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid1-faulty1
rename to tests/fixtures/generic/mdadm-examine-raid1-faulty1.out
diff --git a/tests/fixtures/generic/mdadm/examine-raid1-faulty2 b/tests/fixtures/generic/mdadm-examine-raid1-faulty2.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid1-faulty2
rename to tests/fixtures/generic/mdadm-examine-raid1-faulty2.out
diff --git a/tests/fixtures/generic/mdadm/examine-raid1-moreflags b/tests/fixtures/generic/mdadm-examine-raid1-moreflags.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid1-moreflags
rename to tests/fixtures/generic/mdadm-examine-raid1-moreflags.out
diff --git a/tests/fixtures/generic/mdadm/examine-raid1-ok b/tests/fixtures/generic/mdadm-examine-raid1-ok.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid1-ok
rename to tests/fixtures/generic/mdadm-examine-raid1-ok.out
diff --git a/tests/fixtures/generic/mdadm/examine-raid1-replacing b/tests/fixtures/generic/mdadm-examine-raid1-replacing.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid1-replacing
rename to tests/fixtures/generic/mdadm-examine-raid1-replacing.out
diff --git a/tests/fixtures/generic/mdadm/examine-raid1-resync b/tests/fixtures/generic/mdadm-examine-raid1-resync.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid1-resync
rename to tests/fixtures/generic/mdadm-examine-raid1-resync.out
diff --git a/tests/fixtures/generic/mdadm/examine-raid1-spare b/tests/fixtures/generic/mdadm-examine-raid1-spare.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid1-spare
rename to tests/fixtures/generic/mdadm-examine-raid1-spare.out
diff --git a/tests/fixtures/generic/mdadm/examine-raid1-syncing b/tests/fixtures/generic/mdadm-examine-raid1-syncing.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/examine-raid1-syncing
rename to tests/fixtures/generic/mdadm-examine-raid1-syncing.out
diff --git a/tests/fixtures/generic/mdadm/mdadm-examine.out b/tests/fixtures/generic/mdadm-examine.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/mdadm-examine.out
rename to tests/fixtures/generic/mdadm-examine.out
diff --git a/tests/fixtures/generic/mdadm/mdadm-query-detail.out b/tests/fixtures/generic/mdadm-query-detail.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/mdadm-query-detail.out
rename to tests/fixtures/generic/mdadm-query-detail.out
diff --git a/tests/fixtures/generic/mdadm/query-raid0-ok b/tests/fixtures/generic/mdadm-query-raid0-ok.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/query-raid0-ok
rename to tests/fixtures/generic/mdadm-query-raid0-ok.out
diff --git a/tests/fixtures/generic/mdadm/query-raid1-failed-and-flags b/tests/fixtures/generic/mdadm-query-raid1-failed-and-flags.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/query-raid1-failed-and-flags
rename to tests/fixtures/generic/mdadm-query-raid1-failed-and-flags.out
diff --git a/tests/fixtures/generic/mdadm/query-raid1-faulty_and_removed b/tests/fixtures/generic/mdadm-query-raid1-faulty-and-removed.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/query-raid1-faulty_and_removed
rename to tests/fixtures/generic/mdadm-query-raid1-faulty-and-removed.out
diff --git a/tests/fixtures/generic/mdadm/query-raid1-faulty-with-spare b/tests/fixtures/generic/mdadm-query-raid1-faulty-with-spare.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/query-raid1-faulty-with-spare
rename to tests/fixtures/generic/mdadm-query-raid1-faulty-with-spare.out
diff --git a/tests/fixtures/generic/mdadm/query-raid1-faulty b/tests/fixtures/generic/mdadm-query-raid1-faulty.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/query-raid1-faulty
rename to tests/fixtures/generic/mdadm-query-raid1-faulty.out
diff --git a/tests/fixtures/generic/mdadm/query-raid1-ok-0.9 b/tests/fixtures/generic/mdadm-query-raid1-ok-0-9.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/query-raid1-ok-0.9
rename to tests/fixtures/generic/mdadm-query-raid1-ok-0-9.out
diff --git a/tests/fixtures/generic/mdadm/query-raid1-ok-failfast b/tests/fixtures/generic/mdadm-query-raid1-ok-failfast.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/query-raid1-ok-failfast
rename to tests/fixtures/generic/mdadm-query-raid1-ok-failfast.out
diff --git a/tests/fixtures/generic/mdadm/query-raid1-ok-spare b/tests/fixtures/generic/mdadm-query-raid1-ok-spare.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/query-raid1-ok-spare
rename to tests/fixtures/generic/mdadm-query-raid1-ok-spare.out
diff --git a/tests/fixtures/generic/mdadm/query-raid1-ok b/tests/fixtures/generic/mdadm-query-raid1-ok.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/query-raid1-ok
rename to tests/fixtures/generic/mdadm-query-raid1-ok.out
diff --git a/tests/fixtures/generic/mdadm/query-raid1-rebuild-failfast b/tests/fixtures/generic/mdadm-query-raid1-rebuild-failfast.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/query-raid1-rebuild-failfast
rename to tests/fixtures/generic/mdadm-query-raid1-rebuild-failfast.out
diff --git a/tests/fixtures/generic/mdadm/query-raid1-spare-writem-rebuild b/tests/fixtures/generic/mdadm-query-raid1-spare-writem-rebuild.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/query-raid1-spare-writem-rebuild
rename to tests/fixtures/generic/mdadm-query-raid1-spare-writem-rebuild.out
diff --git a/tests/fixtures/generic/mdadm/query-raid1-syncing b/tests/fixtures/generic/mdadm-query-raid1-syncing.out
similarity index 100%
rename from tests/fixtures/generic/mdadm/query-raid1-syncing
rename to tests/fixtures/generic/mdadm-query-raid1-syncing.out