diff --git a/cmd/osbuild-image-tests/constants/constants.go b/cmd/osbuild-image-tests/constants/constants.go
index 76dc74444..bedf04ccf 100644
--- a/cmd/osbuild-image-tests/constants/constants.go
+++ b/cmd/osbuild-image-tests/constants/constants.go
@@ -34,5 +34,5 @@ var TestPaths = struct {
 	TestCasesDirectory:      "/usr/share/tests/osbuild-composer/cases",
 	UserData:                "/usr/share/tests/osbuild-composer/cloud-init/user-data",
 	MetaData:                "/usr/share/tests/osbuild-composer/cloud-init/meta-data",
-	AzureDeploymentTemplate: "/usr/share/tests/osbuild-composer/azure-deployment-template.json",
+	AzureDeploymentTemplate: "/usr/share/tests/osbuild-composer/azure/deployment-template.json",
 }
diff --git a/golang-github-osbuild-composer.spec b/golang-github-osbuild-composer.spec
index d6a072cea..6ec021da0 100644
--- a/golang-github-osbuild-composer.spec
+++ b/golang-github-osbuild-composer.spec
@@ -123,8 +123,8 @@ install -m 0755 -vp _bin/osbuild-image-tests                %{buildroot}%{_libex
 install -m 0755 -vp _bin/osbuild-auth-tests                %{buildroot}%{_libexecdir}/tests/osbuild-composer/
 install -m 0755 -vp tools/image-info                        %{buildroot}%{_libexecdir}/osbuild-composer/
 
-install -m 0755 -vd                                         %{buildroot}%{_datadir}/tests/osbuild-composer
-install -m 0644 -vp test/azure-deployment-template.json     %{buildroot}%{_datadir}/tests/osbuild-composer/
+install -m 0755 -vd                                         %{buildroot}%{_datadir}/tests/osbuild-composer/azure
+install -m 0644 -vp test/azure/deployment-template.json     %{buildroot}%{_datadir}/tests/osbuild-composer/azure/
 
 install -m 0755 -vd                                         %{buildroot}%{_datadir}/tests/osbuild-composer/cases
 install -m 0644 -vp test/cases/*                            %{buildroot}%{_datadir}/tests/osbuild-composer/cases/
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index c0063e1f2..d34140a40 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -161,8 +161,8 @@ install -m 0755 -vp _bin/osbuild-composer-cloud-tests           %{buildroot}%{_l
 install -m 0755 -vp _bin/osbuild-auth-tests                     %{buildroot}%{_libexecdir}/tests/osbuild-composer/
 install -m 0755 -vp tools/image-info                            %{buildroot}%{_libexecdir}/osbuild-composer/
 
-install -m 0755 -vd                                             %{buildroot}%{_datadir}/tests/osbuild-composer
-install -m 0644 -vp test/azure-deployment-template.json         %{buildroot}%{_datadir}/tests/osbuild-composer/
+install -m 0755 -vd                                             %{buildroot}%{_datadir}/tests/osbuild-composer/azure
+install -m 0644 -vp test/azure/deployment-template.json         %{buildroot}%{_datadir}/tests/osbuild-composer/azure/
 
 install -m 0755 -vd                                             %{buildroot}%{_datadir}/tests/osbuild-composer/cases
 install -m 0644 -vp test/cases/*                                %{buildroot}%{_datadir}/tests/osbuild-composer/cases/