diff --git a/test-cases/folks-alias-persistence.yaml b/test-cases/folks-alias-persistence.yaml
deleted file mode 100644
index ec094da84f255f5e8c961ab3d1412f368980ff4e..0000000000000000000000000000000000000000
--- a/test-cases/folks-alias-persistence.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-metadata:
-  name: folks-alias-persistence
-  format: "Apertis Test Definition 1.0"
-  image-types:
-    target:  [ armhf-internal, amd64 ]
-    sdk:     [ amd64 ]
-  image-deployment:
-    - APT
-  type: functional
-  exec-type: automated
-  priority: medium
-  maintainer: "Apertis Project"
-  description: "Ensures user-set contact aliases persist."
-
-  expected:
-    - "The script will report PASSED or FAILED."
-
-install:
-  deps:
-    - telepathy-ring
-    - telepathy-mission-control-5
-    - telepathy-gabble
-    - libfolks-eds25
-    - libfolks-telepathy25
-    - folks-tools
-    - syncevolution
-  git-repos:
-    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
-      branch: 'apertis/v2020dev0'
-
-run:
-  steps:
-    - "# Enter test directory:"
-    - cd apertis-tests
-    - "# Execute the following command:"
-    - "common/run-test-in-systemd --user=user --timeout=900 folks/folks-alias-persistence.sh"
-
-parse:
-  fixupdict:
-    FAILED: fail
-    PASSED: pass
-  pattern: ^(?P<test_case_id>[\w-]+):\W+(?P<result>PASSED|FAILED)$
diff --git a/test-cases/folks-eds-compatibility.yaml b/test-cases/folks-eds-compatibility.yaml
deleted file mode 100644
index f911dccdc80b46e6223ab6908cc55959d17380f1..0000000000000000000000000000000000000000
--- a/test-cases/folks-eds-compatibility.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-metadata:
-  name: folks-eds-compatibility
-  format: "Apertis Test Definition 1.0"
-  image-types:
-    target:  [ armhf-internal, amd64 ]
-    sdk:     [ amd64 ]
-  image-deployment:
-    - APT
-  type: compatibility
-  exec-type: automated
-  priority: medium
-  maintainer: "Apertis Project"
-  description: "Checks that contacts created within Evolution Data Server (as
-                will happen when phone contacts get synchronized to an Apertis
-                machine) show up in other contact-based programs."
-
-  expected:
-    - "The script will report PASSED or FAILED."
-
-install:
-  deps:
-    - telepathy-ring
-    - telepathy-mission-control-5
-    - telepathy-gabble
-    - libfolks-eds25
-    - libfolks-telepathy25
-    - folks-tools
-    - syncevolution
-  git-repos:
-    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
-      branch: 'apertis/v2020dev0'
-
-run:
-  steps:
-    - "# Enter test directory:"
-    - cd apertis-tests
-    - "# Execute the following command:"
-    - "common/run-test-in-systemd --user=user --timeout=900 folks/folks-eds-compatibility.sh"
-
-parse:
-  fixupdict:
-    FAILED: fail
-    PASSED: pass
-  pattern: ^(?P<test_case_id>[\w\-\s]+):\W+(?P<result>\w+)$
diff --git a/test-cases/folks-extended-info.yaml b/test-cases/folks-extended-info.yaml
deleted file mode 100644
index ba62ff085397bbcd101f5b336735e6e888fd9b19..0000000000000000000000000000000000000000
--- a/test-cases/folks-extended-info.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-metadata:
-  name: folks-extended-info
-  format: "Apertis Test Definition 1.0"
-  image-types:
-    target:  [ armhf-internal, amd64 ]
-    basesdk: [ amd64 ]
-    sdk:     [ amd64 ]
-  image-deployment:
-    - APT
-  type: functional
-  exec-type: automated
-  priority: medium
-  maintainer: "Apertis Project"
-  description: "Support for storing arbitrary data in contacts in Folks."
-
-  expected:
-    - "The output should show PASSED or FAILED, similar to this:"
-    - |
-        >folks-extended-info: PASSED
-
-install:
-  deps:
-    - chaiwala-tests
-    - telepathy-ring
-    - telepathy-mission-control-5
-    - telepathy-gabble
-    - libfolks-eds25
-    - libfolks-telepathy25
-  git-repos:
-    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
-      branch: 'apertis/v2020dev0'
-
-run:
-  steps:
-    - "# Enter test directory:"
-    - cd apertis-tests
-    - "# Execute the following command:"
-    - "common/run-test-in-systemd --user=user --timeout=900 folks/folks-extended-info.sh"
-
-parse:
-  fixupdict:
-    FAILED: fail
-    PASSED: pass
-    FAIL: fail
-    PASS: pass
-    SKIP: skip
-    UNKNOWN: unknown
-  pattern: ^(?P<test_case_id>[a-zA-Z0-9_\-\./]+):\s*(?P<result>PASSED|PASS|pass|FAILED|FAIL|fail|SKIP|skip|UNKNOWN|unknown)$
diff --git a/test-cases/folks-metacontacts-antilinking.yaml b/test-cases/folks-metacontacts-antilinking.yaml
deleted file mode 100644
index 7f2a61e862fea53566c25b87ba3d18baee79e92e..0000000000000000000000000000000000000000
--- a/test-cases/folks-metacontacts-antilinking.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-metadata:
-  name: folks-metacontacts-antilinking
-  format: "Apertis Test Definition 1.0"
-  image-types:
-    target:  [ armhf-internal, amd64 ]
-    sdk:     [ amd64 ]
-  image-deployment:
-    - APT
-  type: functional
-  exec-type: automated
-  priority: medium
-  maintainer: "Apertis Project"
-  description: "Ensures anti-linking meta-contacts works properly."
-
-  expected:
-    - "The script will report PASSED or FAILED."
-
-install:
-  deps:
-    - telepathy-ring
-    - telepathy-mission-control-5
-    - telepathy-gabble
-    - libfolks-eds25
-    - libfolks-telepathy25
-    - folks-tools
-  git-repos:
-    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
-      branch: 'apertis/v2020dev0'
-
-run:
-  steps:
-    - "# Enter test directory:"
-    - cd apertis-tests
-    - "# Execute the following command:"
-    - "common/run-test-in-systemd --user=user --timeout=900 folks/folks-metacontacts-antilinking.sh"
-
-parse:
-  fixupdict:
-    FAILED: fail
-    PASSED: pass
-  pattern: ^(?P<test_case_id>[\w-]+):\W+(?P<result>PASSED|FAILED)$
diff --git a/test-cases/folks-metacontacts-linking.yaml b/test-cases/folks-metacontacts-linking.yaml
deleted file mode 100644
index edbe648835c53a8d04753c65568a20d50082aa11..0000000000000000000000000000000000000000
--- a/test-cases/folks-metacontacts-linking.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-metadata:
-  name: folks-metacontacts-linking
-  format: "Apertis Test Definition 1.0"
-  image-types:
-    target:  [ armhf-internal, amd64 ]
-    sdk:     [ amd64 ]
-  image-deployment:
-    - APT
-  type: functional
-  exec-type: automated
-  priority: medium
-  maintainer: "Apertis Project"
-  description: "Ensures linking meta-contacts works properly."
-
-  expected:
-    - "The script will report PASSED or FAILED."
-
-install:
-  deps:
-    - telepathy-ring
-    - telepathy-mission-control-5
-    - telepathy-gabble
-    - libfolks-eds25
-    - libfolks-telepathy25
-    - folks-tools
-    - syncevolution
-  git-repos:
-    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
-      branch: 'apertis/v2020dev0'
-
-run:
-  steps:
-    - "# Enter test directory:"
-    - cd apertis-tests
-    - "# Execute the following command:"
-    - "common/run-test-in-systemd --user=user --timeout=900 folks/folks-metacontacts-linking.sh"
-
-parse:
-  fixupdict:
-    FAILED: fail
-    PASSED: pass
-  pattern: ^(?P<test_case_id>[\w-]+):\W+(?P<result>PASSED|FAILED)$
diff --git a/test-cases/folks-metacontacts-unlinking.yaml b/test-cases/folks-metacontacts-unlinking.yaml
deleted file mode 100644
index d7fc0bbf7622c41822d97ba324a34835432b8c85..0000000000000000000000000000000000000000
--- a/test-cases/folks-metacontacts-unlinking.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-metadata:
-  name: folks-metacontacts-unlinking
-  format: "Apertis Test Definition 1.0"
-  image-types:
-    target:  [ armhf-internal, amd64 ]
-    sdk:     [ amd64 ]
-  image-deployment:
-    - APT
-  type: functional
-  exec-type: automated
-  priority: medium
-  maintainer: "Apertis Project"
-  description: "Ensures unlinking meta-contacts works properly."
-
-  expected:
-    - "The script will report PASSED or FAILED."
-
-install:
-  deps:
-    - telepathy-ring
-    - telepathy-mission-control-5
-    - telepathy-gabble
-    - libfolks-eds25
-    - libfolks-telepathy25
-    - folks-tools
-    - syncevolution
-  git-repos:
-    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
-      branch: 'apertis/v2020dev0'
-
-run:
-  steps:
-    - "# Enter test directory:"
-    - cd apertis-tests
-    - "# Execute the following command:"
-    - "common/run-test-in-systemd --user=user --timeout=900 folks/folks-metacontacts-unlinking.sh"
-
-parse:
-  fixupdict:
-    FAILED: fail
-    PASSED: pass
-  pattern: ^(?P<test_case_id>[\w-]+):\W+(?P<result>PASSED|FAILED)$
diff --git a/test-cases/folks-search-contacts.yaml b/test-cases/folks-search-contacts.yaml
deleted file mode 100644
index 76833fd9ce0a031c728b3efb3aa04831bf185959..0000000000000000000000000000000000000000
--- a/test-cases/folks-search-contacts.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-metadata:
-  name: folks-search-contacts
-  format: "Apertis Test Definition 1.0"
-  image-types:
-    target:  [ armhf-internal, amd64 ]
-    sdk:     [ amd64 ]
-  image-deployment:
-    - APT
-  type: functional
-  exec-type: automated
-  priority: medium
-  maintainer: "Apertis Project"
-  description: "Ensures that Folks can correctly search contacts."
-
-  expected:
-    - "The script will report PASSED or FAILED."
-
-install:
-  deps:
-    - telepathy-ring
-    - telepathy-mission-control-5
-    - telepathy-gabble
-    - libfolks-eds25
-    - libfolks-telepathy25
-    - folks-tools
-    - syncevolution
-  git-repos:
-    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
-      branch: 'apertis/v2020dev0'
-
-run:
-  steps:
-    - "# Enter test directory:"
-    - cd apertis-tests
-    - "# Execute the following command:"
-    - common/run-test-in-systemd --user=user --timeout=900 folks/folks-search-contacts.sh
-
-parse:
-  fixupdict:
-    FAILED: fail
-    PASSED: pass
-  pattern: ^(?P<test_case_id>[\w-]+):\W+(?P<result>PASSED|FAILED)$