diff --git a/internal/acceptance/openstack/baremetal/httpbasic/pkg.go b/internal/acceptance/openstack/baremetal/httpbasic/pkg.go
new file mode 100644
index 0000000000..bfe9e98db9
--- /dev/null
+++ b/internal/acceptance/openstack/baremetal/httpbasic/pkg.go
@@ -0,0 +1,5 @@
+//go:build acceptance || baremetal
+
+// The httpbasic package contains acceptance tests for the OpenStack Bare Metal v1 service with HTTP Basic authentation.
+
+package httpbasic
diff --git a/internal/acceptance/openstack/baremetal/noauth/pkg.go b/internal/acceptance/openstack/baremetal/noauth/pkg.go
new file mode 100644
index 0000000000..e601a40ce5
--- /dev/null
+++ b/internal/acceptance/openstack/baremetal/noauth/pkg.go
@@ -0,0 +1,5 @@
+//go:build acceptance || baremetal
+
+// The noauth package contains acceptance tests for the OpenStack Bare Metal v1 service without authentation.
+
+package noauth
diff --git a/internal/acceptance/openstack/baremetal/v1/pkg.go b/internal/acceptance/openstack/baremetal/v1/pkg.go
new file mode 100644
index 0000000000..faf454b835
--- /dev/null
+++ b/internal/acceptance/openstack/baremetal/v1/pkg.go
@@ -0,0 +1,5 @@
+//go:build acceptance || baremetal
+
+// The v1 package contains acceptance tests for the OpenStack Bare Metal v1 service.
+
+package v1
diff --git a/internal/acceptance/openstack/blockstorage/noauth/pkg.go b/internal/acceptance/openstack/blockstorage/noauth/pkg.go
new file mode 100644
index 0000000000..60df33443c
--- /dev/null
+++ b/internal/acceptance/openstack/blockstorage/noauth/pkg.go
@@ -0,0 +1,5 @@
+//go:build acceptance || blockstorage
+
+// The noauth package contains acceptance tests for the OpenStack Block Storage v3 service with no authentation.
+
+package noauth
diff --git a/internal/acceptance/openstack/blockstorage/v2/pkg.go b/internal/acceptance/openstack/blockstorage/v2/pkg.go
index 31dd0ffcb0..039a168159 100644
--- a/internal/acceptance/openstack/blockstorage/v2/pkg.go
+++ b/internal/acceptance/openstack/blockstorage/v2/pkg.go
@@ -1,3 +1,5 @@
-// The v2 package contains acceptance tests for the Openstack Cinder V2 service.
+//go:build acceptance || blockstorage
+
+// The v2 package contains acceptance tests for the Openstack Block Storage v2 service.
 
 package v2
diff --git a/internal/acceptance/openstack/blockstorage/v3/pkg.go b/internal/acceptance/openstack/blockstorage/v3/pkg.go
index b86245c710..e0b01c5f49 100644
--- a/internal/acceptance/openstack/blockstorage/v3/pkg.go
+++ b/internal/acceptance/openstack/blockstorage/v3/pkg.go
@@ -1,3 +1,5 @@
-// The v3 package contains acceptance tests for the OpenStack Cinder V3 service.
+//go:build acceptance || blockstorage
+
+// The v3 package contains acceptance tests for the OpenStack Block Storage v3 service.
 
 package v3
diff --git a/internal/acceptance/openstack/clustering/v1/pkg.go b/internal/acceptance/openstack/clustering/v1/pkg.go
index e2200bc5ba..159aed7e11 100644
--- a/internal/acceptance/openstack/clustering/v1/pkg.go
+++ b/internal/acceptance/openstack/clustering/v1/pkg.go
@@ -1,2 +1,5 @@
-// Package v1 package contains acceptance tests for the Openstack Clustering V1 service.
+//go:build acceptance || clustering
+
+// The v1 package contains acceptance tests for the Openstack Clustering v1 service.
+
 package v1
diff --git a/internal/acceptance/openstack/compute/v2/pkg.go b/internal/acceptance/openstack/compute/v2/pkg.go
index a57c1e7bfa..7ff7750b48 100644
--- a/internal/acceptance/openstack/compute/v2/pkg.go
+++ b/internal/acceptance/openstack/compute/v2/pkg.go
@@ -1,2 +1,5 @@
-// Package v2 package contains acceptance tests for the Openstack Compute V2 service.
+//go:build acceptance || compute
+
+// Package v2 package contains acceptance tests for the Openstack Compute v2 service.
+
 package v2
diff --git a/internal/acceptance/openstack/container/v1/pkg.go b/internal/acceptance/openstack/container/v1/pkg.go
new file mode 100644
index 0000000000..357c83b3d4
--- /dev/null
+++ b/internal/acceptance/openstack/container/v1/pkg.go
@@ -0,0 +1,5 @@
+//go:build acceptance || container
+
+// The v1 package contains acceptance tests for the Openstack Container v1 service.
+
+package v1
diff --git a/internal/acceptance/openstack/containerinfra/v1/pkg.go b/internal/acceptance/openstack/containerinfra/v1/pkg.go
index b7b1f993d5..0babe5ed78 100644
--- a/internal/acceptance/openstack/containerinfra/v1/pkg.go
+++ b/internal/acceptance/openstack/containerinfra/v1/pkg.go
@@ -1 +1,5 @@
+//go:build acceptance || containerinfra
+
+// The v1 package contains acceptance tests for the Openstack Container Infra v1 service.
+
 package v1
diff --git a/internal/acceptance/openstack/db/v1/pkg.go b/internal/acceptance/openstack/db/v1/pkg.go
index b7b1f993d5..6b6f5ac92d 100644
--- a/internal/acceptance/openstack/db/v1/pkg.go
+++ b/internal/acceptance/openstack/db/v1/pkg.go
@@ -1 +1,5 @@
+//go:build acceptance || db
+
+// The v1 package contains acceptance tests for the Openstack DB v1 service.
+
 package v1
diff --git a/internal/acceptance/openstack/dns/v2/pkg.go b/internal/acceptance/openstack/dns/v2/pkg.go
new file mode 100644
index 0000000000..749b2380dd
--- /dev/null
+++ b/internal/acceptance/openstack/dns/v2/pkg.go
@@ -0,0 +1,5 @@
+//go:build acceptance || dns
+
+// The v1 package contains acceptance tests for the Openstack DNS v1 service.
+
+package v2
diff --git a/internal/acceptance/openstack/identity/v2/pkg.go b/internal/acceptance/openstack/identity/v2/pkg.go
index 5ec3cc8e83..4c072f590d 100644
--- a/internal/acceptance/openstack/identity/v2/pkg.go
+++ b/internal/acceptance/openstack/identity/v2/pkg.go
@@ -1 +1,5 @@
+//go:build acceptance || identity
+
+// The v2 package contains acceptance tests for the Openstack Identity v2 service.
+
 package v2
diff --git a/internal/acceptance/openstack/identity/v3/pkg.go b/internal/acceptance/openstack/identity/v3/pkg.go
index eac3ae96a1..22c792fdda 100644
--- a/internal/acceptance/openstack/identity/v3/pkg.go
+++ b/internal/acceptance/openstack/identity/v3/pkg.go
@@ -1 +1,5 @@
+//go:build acceptance || identity
+
+// The v3 package contains acceptance tests for the Openstack Identity v3 service.
+
 package v3
diff --git a/internal/acceptance/openstack/image/v2/pkg.go b/internal/acceptance/openstack/image/v2/pkg.go
new file mode 100644
index 0000000000..a61c1825b4
--- /dev/null
+++ b/internal/acceptance/openstack/image/v2/pkg.go
@@ -0,0 +1,5 @@
+//go:build acceptance || image
+
+// The v2 package contains acceptance tests for the Openstack Image v2 service.
+
+package v2
diff --git a/internal/acceptance/openstack/keymanager/v1/pkg.go b/internal/acceptance/openstack/keymanager/v1/pkg.go
new file mode 100644
index 0000000000..9839bc5094
--- /dev/null
+++ b/internal/acceptance/openstack/keymanager/v1/pkg.go
@@ -0,0 +1,5 @@
+//go:build acceptance || keymanager
+
+// The v1 package contains acceptance tests for the Openstack Keymanager v1 service.
+
+package v1
diff --git a/internal/acceptance/openstack/loadbalancer/v2/pkg.go b/internal/acceptance/openstack/loadbalancer/v2/pkg.go
index 5ec3cc8e83..790c5b4737 100644
--- a/internal/acceptance/openstack/loadbalancer/v2/pkg.go
+++ b/internal/acceptance/openstack/loadbalancer/v2/pkg.go
@@ -1 +1,5 @@
+//go:build acceptance || loadbalancer
+
+// The v2 package contains acceptance tests for the Openstack Loadbalancer v2 service.
+
 package v2
diff --git a/internal/acceptance/openstack/messaging/v2/pkg.go b/internal/acceptance/openstack/messaging/v2/pkg.go
new file mode 100644
index 0000000000..be815df451
--- /dev/null
+++ b/internal/acceptance/openstack/messaging/v2/pkg.go
@@ -0,0 +1,5 @@
+//go:build acceptance || messaging
+
+// The v2 package contains acceptance tests for the Openstack Messaging v2 service.
+
+package v2
diff --git a/internal/acceptance/openstack/networking/v2/pkg.go b/internal/acceptance/openstack/networking/v2/pkg.go
new file mode 100644
index 0000000000..01ac7a87bb
--- /dev/null
+++ b/internal/acceptance/openstack/networking/v2/pkg.go
@@ -0,0 +1,5 @@
+//go:build acceptance || networking
+
+// The v2 package contains acceptance tests for the Openstack Networking v2 service.
+
+package v2
diff --git a/internal/acceptance/openstack/objectstorage/v1/pkg.go b/internal/acceptance/openstack/objectstorage/v1/pkg.go
index b7b1f993d5..d8a67e553c 100644
--- a/internal/acceptance/openstack/objectstorage/v1/pkg.go
+++ b/internal/acceptance/openstack/objectstorage/v1/pkg.go
@@ -1 +1,5 @@
+//go:build acceptance || objectstorage
+
+// The v1 package contains acceptance tests for the Openstack Object Storage v1 service.
+
 package v1
diff --git a/internal/acceptance/openstack/orchestration/v1/pkg.go b/internal/acceptance/openstack/orchestration/v1/pkg.go
new file mode 100644
index 0000000000..e825736c0a
--- /dev/null
+++ b/internal/acceptance/openstack/orchestration/v1/pkg.go
@@ -0,0 +1,5 @@
+//go:build acceptance || orchestration
+
+// The v1 package contains acceptance tests for the Openstack Orchestration v1 service.
+
+package v1
diff --git a/internal/acceptance/openstack/placement/v1/pkg.go b/internal/acceptance/openstack/placement/v1/pkg.go
index d8a8b16cb9..316618153a 100644
--- a/internal/acceptance/openstack/placement/v1/pkg.go
+++ b/internal/acceptance/openstack/placement/v1/pkg.go
@@ -1,2 +1,5 @@
-// Package placement contains acceptance tests for the Openstack Placement service.
+//go:build acceptance || placement
+
+// The v1 package contains acceptance tests for the Openstack Placment v1 service.
+
 package v1
diff --git a/internal/acceptance/openstack/sharedfilesystems/v2/messages/messages.go b/internal/acceptance/openstack/sharedfilesystems/v2/messages.go
similarity index 97%
rename from internal/acceptance/openstack/sharedfilesystems/v2/messages/messages.go
rename to internal/acceptance/openstack/sharedfilesystems/v2/messages.go
index 1c50770e75..ac07ddeb62 100644
--- a/internal/acceptance/openstack/sharedfilesystems/v2/messages/messages.go
+++ b/internal/acceptance/openstack/sharedfilesystems/v2/messages.go
@@ -1,4 +1,4 @@
-package messages
+package v2
 
 import (
 	"context"
diff --git a/internal/acceptance/openstack/sharedfilesystems/v2/messages/pkg.go b/internal/acceptance/openstack/sharedfilesystems/v2/messages/pkg.go
deleted file mode 100644
index 0046213058..0000000000
--- a/internal/acceptance/openstack/sharedfilesystems/v2/messages/pkg.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// The v2 package contains acceptance tests for the Openstack Manila V2 messages package
-
-package messages
diff --git a/internal/acceptance/openstack/sharedfilesystems/v2/messages/messages_test.go b/internal/acceptance/openstack/sharedfilesystems/v2/messages_test.go
similarity index 99%
rename from internal/acceptance/openstack/sharedfilesystems/v2/messages/messages_test.go
rename to internal/acceptance/openstack/sharedfilesystems/v2/messages_test.go
index 32ad0f5528..c78e6d6696 100644
--- a/internal/acceptance/openstack/sharedfilesystems/v2/messages/messages_test.go
+++ b/internal/acceptance/openstack/sharedfilesystems/v2/messages_test.go
@@ -1,6 +1,6 @@
 //go:build acceptance || sharedfilesystems || messages
 
-package messages
+package v2
 
 import (
 	"context"
diff --git a/internal/acceptance/openstack/sharedfilesystems/v2/pkg.go b/internal/acceptance/openstack/sharedfilesystems/v2/pkg.go
index 5a5cd2b3f0..6c94d20ae8 100644
--- a/internal/acceptance/openstack/sharedfilesystems/v2/pkg.go
+++ b/internal/acceptance/openstack/sharedfilesystems/v2/pkg.go
@@ -1,3 +1,5 @@
-// The v2 package contains acceptance tests for the Openstack Manila V2 service.
+//go:build acceptance || sharedfilesystems
+
+// The v2 package contains acceptance tests for the Openstack Shared File Systems v2 service.
 
 package v2
diff --git a/internal/acceptance/openstack/workflow/v2/pkg.go b/internal/acceptance/openstack/workflow/v2/pkg.go
new file mode 100644
index 0000000000..716529fd0d
--- /dev/null
+++ b/internal/acceptance/openstack/workflow/v2/pkg.go
@@ -0,0 +1,5 @@
+//go:build acceptance || workflow
+
+// The v2 package contains acceptance tests for the Openstack Workflow v2 service.
+
+package v2