diff --git a/test/TEST-01-BASIC/.shchkdir b/test/.shchkdir
similarity index 100%
rename from test/TEST-01-BASIC/.shchkdir
rename to test/.shchkdir
diff --git a/test/TEST-02-SYSTEMD/.shchkdir b/test/TEST-02-SYSTEMD/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-03-USR-MOUNT/.shchkdir b/test/TEST-03-USR-MOUNT/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-04-FULL-SYSTEMD/.shchkdir b/test/TEST-04-FULL-SYSTEMD/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-10-RAID/.shchkdir b/test/TEST-10-RAID/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-11-LVM/.shchkdir b/test/TEST-11-LVM/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-12-RAID-DEG/.shchkdir b/test/TEST-12-RAID-DEG/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-13-ENC-RAID-LVM/.shchkdir b/test/TEST-13-ENC-RAID-LVM/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-14-IMSM/.shchkdir b/test/TEST-14-IMSM/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-15-BTRFSRAID/.shchkdir b/test/TEST-15-BTRFSRAID/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-16-DMSQUASH/.shchkdir b/test/TEST-16-DMSQUASH/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-17-LVM-THIN/.shchkdir b/test/TEST-17-LVM-THIN/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-20-NFS/.shchkdir b/test/TEST-20-NFS/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-30-ISCSI/.shchkdir b/test/TEST-30-ISCSI/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-35-ISCSI-MULTI/.shchkdir b/test/TEST-35-ISCSI-MULTI/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-40-NBD/.shchkdir b/test/TEST-40-NBD/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-50-MULTINIC/.shchkdir b/test/TEST-50-MULTINIC/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/.shchkdir b/test/TEST-60-BONDBRIDGEVLANIFCFG/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-98-GETARG/.shchkdir b/test/TEST-98-GETARG/.shchkdir
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/TEST-99-RPM/.shchkdir b/test/TEST-99-RPM/.shchkdir
deleted file mode 100644
index e69de29b..00000000