diff --git a/Makefile b/Makefile
index 94fe9803..f920dc72 100644
--- a/Makefile
+++ b/Makefile
@@ -161,6 +161,7 @@ branding:
 	rm -rf tests/test_playbooks/scc_* tests/test_playbooks/tasks/scc_* tests/test_playbooks/fixtures/scc_* plugins/modules/scc_*.py tests/fixtures/apidoc/scc_*.json
 	rm -rf tests/test_playbooks/snapshot* tests/test_playbooks/tasks/snapshot* tests/test_playbooks/fixtures/snapshot* plugins/modules/snapshot*.py tests/fixtures/apidoc/snapshot*.json
 	rm -rf tests/test_playbooks/*_deb.yml
+	rm -rf tests/test_playbooks/*_ostree.yml
 	make $(RUNTIME_YML)
 
 FORCE:
diff --git a/tests/test_playbooks/content_upload_ostree.yml b/tests/test_playbooks/content_upload_ostree.yml
deleted file mode 100644
index c3b9dec0..00000000
--- a/tests/test_playbooks/content_upload_ostree.yml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-- hosts: localhost
-  collections:
-    - redhat.satellite
-  gather_facts: false
-  vars_files:
-    - vars/server.yml
-  tasks:
-    - include_tasks: tasks/organization.yml
-      vars:
-        organization_state: present
-    - include_tasks: tasks/product.yml
-      vars:
-        product_state: present
-    - include_tasks: tasks/repository.yml
-      vars:
-        repository_state: absent
-        repository_name: "Test OStree Repository"
-        repository_content_type: "ostree"
-    - include_tasks: tasks/repository.yml
-      vars:
-        repository_state: present
-        repository_name: "Test OStree Repository"
-        repository_content_type: "ostree"
-
-- hosts: tests
-  collections:
-    - redhat.satellite
-  gather_facts: false
-  vars_files:
-    - vars/server.yml
-  tasks:
-
-    - name: upload ostree archive
-      include_tasks: tasks/upload.yml
-      vars:
-        upload_src: "{{ playbook_dir }}/data/fixtures_small_repo.tar"
-        upload_repository: "Test OStree Repository"
-        upload_ostree_repository_name: "small"
-        expected_change: true
-    - name: upload ostree archive again, change due to API limitations
-      include_tasks: tasks/upload.yml
-      vars:
-        upload_src: "{{ playbook_dir }}/data/fixtures_small_repo.tar"
-        upload_repository: "Test OStree Repository"
-        upload_ostree_repository_name: "small"
-        expected_change: true
-
-- hosts: localhost
-  collections:
-    - redhat.satellite
-  gather_facts: false
-  vars_files:
-    - vars/server.yml
-  tasks:
-    - include_tasks: tasks/repository.yml
-      vars:
-        repository_state: absent
-        repository_name: "Test OStree Repository"
-        repository_content_type: "ostree"
-    - include_tasks: tasks/product.yml
-      vars:
-        product_state: absent
-    - include_tasks: tasks/organization.yml
-      vars:
-        organization_state: absent
-...
diff --git a/tests/test_playbooks/repository_ostree.yml b/tests/test_playbooks/repository_ostree.yml
deleted file mode 100644
index 380df79e..00000000
--- a/tests/test_playbooks/repository_ostree.yml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-- hosts: localhost
-  collections:
-    - redhat.satellite
-  gather_facts: false
-  vars_files:
-    - vars/server.yml
-  tasks:
-    - include_tasks: tasks/organization.yml
-      vars:
-        organization_state: present
-    - include_tasks: tasks/content_credential.yml
-      vars:
-        content_credential_state: present
-    - include_tasks: tasks/content_credential.yml
-      vars:
-        content_credential_name: "Test SSL Cert"
-        content_credential_type: "cert"
-        content_credential_state: present
-    - include_tasks: tasks/product.yml
-      vars:
-        product_state: present
-
-- hosts: tests
-  collections:
-    - redhat.satellite
-  gather_facts: false
-  vars_files:
-    - vars/server.yml
-  tasks:
-    - name: Create Ostree Repository
-      include_tasks: tasks/repository.yml
-      vars:
-        repository_state: present
-        repository_label: "just_a_test_repo_ostree"
-        repository_name: Test OStree Repository
-        repository_content_type: ostree
-        repository_url: https://fixtures.pulpproject.org/ostree/small/
-        expected_change: true
-    - name: sync repository
-      include_tasks: tasks/katello_sync.yml
-      vars:
-        repository: "Test OStree Repository"
-    - name: remove repository
-      include_tasks: tasks/repository.yml
-      vars:
-        repository_state: absent
-        repository_name: Test OStree Repository
-        repository_content_type: ostree
-        expected_change: true
-
-- hosts: localhost
-  collections:
-    - redhat.satellite
-  gather_facts: false
-  vars_files:
-    - vars/server.yml
-  tasks:
-    - include_tasks: tasks/content_credential.yml
-      vars:
-        content_credential_name: "Test SSL Cert"
-        content_credential_type: "cert"
-        content_credential_state: absent
-    - include_tasks: tasks/content_credential.yml
-      vars:
-        content_credential_state: absent
-    - include_tasks: tasks/product.yml
-      vars:
-        product_state: absent
-    - include_tasks: tasks/organization.yml
-      vars:
-        organization_state: absent
-...