diff --git a/pkg/util/azureclient/applens/applens_client_test.go b/pkg/util/azureclient/applens/applens_client_test.go
index d0a9f3a6448..70c93eff267 100644
--- a/pkg/util/azureclient/applens/applens_client_test.go
+++ b/pkg/util/azureclient/applens/applens_client_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
 
-	testhttp "github.com/Azure/ARO-RP/test/util/http"
+	testhttp "github.com/Azure/ARO-RP/test/util/http/server"
 )
 
 func TestEnsureErrorIsGeneratedOnResponse(t *testing.T) {
diff --git a/pkg/util/azureclient/applens/applens_error_test.go b/pkg/util/azureclient/applens/applens_error_test.go
index 4bc71032c0d..93d96499418 100644
--- a/pkg/util/azureclient/applens/applens_error_test.go
+++ b/pkg/util/azureclient/applens/applens_error_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
 
-	testhttp "github.com/Azure/ARO-RP/test/util/http"
+	testhttp "github.com/Azure/ARO-RP/test/util/http/server"
 )
 
 func TestAppLensErrorOnEmptyResponse(t *testing.T) {
diff --git a/pkg/util/azureclient/authz/remotepdp/client_test.go b/pkg/util/azureclient/authz/remotepdp/client_test.go
index dcc17849a0a..440769755b1 100644
--- a/pkg/util/azureclient/authz/remotepdp/client_test.go
+++ b/pkg/util/azureclient/authz/remotepdp/client_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
 
-	testhttp "github.com/Azure/ARO-RP/test/util/http"
+	testhttp "github.com/Azure/ARO-RP/test/util/http/server"
 )
 
 func TestClientCreate(t *testing.T) {
diff --git a/test/util/http/mock.go b/test/util/http/server/server_mock.go
similarity index 99%
rename from test/util/http/mock.go
rename to test/util/http/server/server_mock.go
index 36ed691a818..0e495f76108 100644
--- a/test/util/http/mock.go
+++ b/test/util/http/server/server_mock.go
@@ -1,4 +1,4 @@
-package applens
+package server
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the Apache License 2.0.
diff --git a/test/util/http/mock_test.go b/test/util/http/server/server_mock_test.go
similarity index 99%
rename from test/util/http/mock_test.go
rename to test/util/http/server/server_mock_test.go
index afb0b92fdf4..b937fa1b373 100644
--- a/test/util/http/mock_test.go
+++ b/test/util/http/server/server_mock_test.go
@@ -1,4 +1,4 @@
-package applens
+package server
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the Apache License 2.0.