diff --git a/builder/azure/common/client/config.go b/builder/azure/common/client/config.go
index 230188eb5..7591b4b33 100644
--- a/builder/azure/common/client/config.go
+++ b/builder/azure/common/client/config.go
@@ -4,7 +4,6 @@ package client
 
 import (
 	"fmt"
-	"github.com/hashicorp/packer/builder/azure/common"
 	"os"
 	"strings"
 	"time"
@@ -303,4 +302,4 @@ func (c *Config) FillParameters() error {
 }
 
 // allow override for unit tests
-var findTenantID = common.FindTenantID
+var findTenantID = FindTenantID
diff --git a/builder/azure/common/detect_azure.go b/builder/azure/common/client/detect_azure.go
similarity index 90%
rename from builder/azure/common/detect_azure.go
rename to builder/azure/common/client/detect_azure.go
index 001ca1b4f..fef7a2932 100644
--- a/builder/azure/common/detect_azure.go
+++ b/builder/azure/common/client/detect_azure.go
@@ -1,6 +1,6 @@
 // +build !linux
 
-package common
+package client
 
 // IsAzure returns true if Packer is running on Azure (currently only works on Linux)
 func IsAzure() bool {
diff --git a/builder/azure/common/detect_azure_linux.go b/builder/azure/common/client/detect_azure_linux.go
similarity index 96%
rename from builder/azure/common/detect_azure_linux.go
rename to builder/azure/common/client/detect_azure_linux.go
index f57eb42b9..c2b9a2800 100644
--- a/builder/azure/common/detect_azure_linux.go
+++ b/builder/azure/common/client/detect_azure_linux.go
@@ -1,4 +1,4 @@
-package common
+package client
 
 import (
 	"bytes"
diff --git a/builder/azure/common/detect_azure_linux_test.go b/builder/azure/common/client/detect_azure_linux_test.go
similarity index 97%
rename from builder/azure/common/detect_azure_linux_test.go
rename to builder/azure/common/client/detect_azure_linux_test.go
index 9d755cfd9..5975d7a6b 100644
--- a/builder/azure/common/detect_azure_linux_test.go
+++ b/builder/azure/common/client/detect_azure_linux_test.go
@@ -1,4 +1,4 @@
-package common
+package client
 
 import (
 	"io/ioutil"
diff --git a/builder/azure/common/devicelogin.go b/builder/azure/common/client/devicelogin.go
similarity index 99%
rename from builder/azure/common/devicelogin.go
rename to builder/azure/common/client/devicelogin.go
index ea177638a..888e851bf 100644
--- a/builder/azure/common/devicelogin.go
+++ b/builder/azure/common/client/devicelogin.go
@@ -1,4 +1,4 @@
-package common
+package client
 
 import (
 	"context"
diff --git a/builder/azure/common/client/metadata_test.go b/builder/azure/common/client/metadata_test.go
index dddc9a2a0..75353d141 100644
--- a/builder/azure/common/client/metadata_test.go
+++ b/builder/azure/common/client/metadata_test.go
@@ -6,12 +6,11 @@ import (
 
 	"github.com/Azure/go-autorest/autorest/azure"
 
-	"github.com/hashicorp/packer/builder/azure/common"
 	"github.com/stretchr/testify/assert"
 )
 
 func Test_MetadataReturnsComputeInfo(t *testing.T) {
-	if !common.IsAzure() {
+	if !IsAzure() {
 		t.Skipf("Not running on Azure, skipping live IMDS test")
 	}
 	mdc := NewMetadataClient()
diff --git a/builder/azure/common/client/tokenprovider_devicewflow.go b/builder/azure/common/client/tokenprovider_devicewflow.go
index 3c2b9fd17..00d83488a 100644
--- a/builder/azure/common/client/tokenprovider_devicewflow.go
+++ b/builder/azure/common/client/tokenprovider_devicewflow.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/Azure/go-autorest/autorest/adal"
 	"github.com/Azure/go-autorest/autorest/azure"
-	packerAzureCommon "github.com/hashicorp/packer/builder/azure/common"
 )
 
 func NewDeviceFlowOAuthTokenProvider(env azure.Environment, say func(string), tenantID string) oAuthTokenProvider {
@@ -36,5 +35,5 @@ func (tp *deviceflowOauthTokenProvider) getServicePrincipalTokenWithResource(res
 		tp.say(fmt.Sprintf("Getting token for %s", resource))
 	}
 
-	return packerAzureCommon.Authenticate(tp.env, tp.tenantID, tp.say, resource)
+	return Authenticate(tp.env, tp.tenantID, tp.say, resource)
 }