diff --git a/client/actions/channels/channel_client_test.go b/client/actions/channels/channel_client_test.go
index f55e1ff..1d67596 100644
--- a/client/actions/channels/channel_client_test.go
+++ b/client/actions/channels/channel_client_test.go
@@ -22,7 +22,7 @@ var _ = Describe("ClusterClient", func() {
 
 		BeforeEach(func() {
 			endpoint = "https://satcon.foo"
-			iamClient, err = iam.NewIAMClient("some_key")
+			iamClient, err = iam.NewIAMClient("some_key", "")
 			Expect(err).ToNot(HaveOccurred())
 		})
 
diff --git a/client/actions/clusters/cluster_client_test.go b/client/actions/clusters/cluster_client_test.go
index ec8a082..c1a74b5 100644
--- a/client/actions/clusters/cluster_client_test.go
+++ b/client/actions/clusters/cluster_client_test.go
@@ -22,7 +22,7 @@ var _ = Describe("ClusterClient", func() {
 
 		BeforeEach(func() {
 			endpoint = "https://satcon.foo"
-			iamClient, err = iam.NewIAMClient("some_key")
+			iamClient, err = iam.NewIAMClient("some_key", "")
 			Expect(err).ToNot(HaveOccurred())
 
 		})
diff --git a/client/actions/subscriptions/subscription_client_test.go b/client/actions/subscriptions/subscription_client_test.go
index 04a55d2..2fc967d 100644
--- a/client/actions/subscriptions/subscription_client_test.go
+++ b/client/actions/subscriptions/subscription_client_test.go
@@ -22,7 +22,7 @@ var _ = Describe("ClusterClient", func() {
 
 		BeforeEach(func() {
 			endpoint = "https://satcon.foo"
-			iamClient, err = iam.NewIAMClient("some_key")
+			iamClient, err = iam.NewIAMClient("some_key", "")
 			Expect(err).ToNot(HaveOccurred())
 		})
 
diff --git a/client/actions/users/user_client_test.go b/client/actions/users/user_client_test.go
index 8175bd4..783eadb 100644
--- a/client/actions/users/user_client_test.go
+++ b/client/actions/users/user_client_test.go
@@ -22,7 +22,7 @@ var _ = Describe("UserClient", func() {
 
 		BeforeEach(func() {
 			endpoint = "https://satcon.foo"
-			iamClient, err = iam.NewIAMClient("some_key")
+			iamClient, err = iam.NewIAMClient("some_key", "")
 			Expect(err).ToNot(HaveOccurred())
 		})
 
diff --git a/client/actions/versions/version_client_test.go b/client/actions/versions/version_client_test.go
index 4d4dcaa..59be98c 100644
--- a/client/actions/versions/version_client_test.go
+++ b/client/actions/versions/version_client_test.go
@@ -22,7 +22,7 @@ var _ = Describe("ClusterClient", func() {
 
 		BeforeEach(func() {
 			endpoint = "https://satcon.foo"
-			iamClient, err = iam.NewIAMClient("some_key")
+			iamClient, err = iam.NewIAMClient("some_key", "")
 			Expect(err).ToNot(HaveOccurred())
 
 		})
diff --git a/client/auth/iam/client.go b/client/auth/iam/client.go
index a0dc298..9af8541 100644
--- a/client/auth/iam/client.go
+++ b/client/auth/iam/client.go
@@ -11,9 +11,9 @@ type Client struct {
 }
 
 //NewIAMClient returns a new core.IamAuthenticator struct and also returns the error
-func NewIAMClient(apiKey string) (*Client, error) {
+func NewIAMClient(apiKey string, url string) (*Client, error) {
 
-	iamClient, err := core.NewIamAuthenticator(apiKey, "", "", "", false, nil)
+	iamClient, err := core.NewIamAuthenticator(apiKey, url, "", "", false, nil)
 
 	if err == nil {
 		return &Client{Client: iamClient}, nil
diff --git a/client/auth/iam/client_test.go b/client/auth/iam/client_test.go
index f17c3fc..2497fea 100644
--- a/client/auth/iam/client_test.go
+++ b/client/auth/iam/client_test.go
@@ -15,7 +15,7 @@ var _ = Describe("Client", func() {
 
 	It("returns a new IAMClient", func() {
 
-		iamClient, err := iam.NewIAMClient(apiKey)
+		iamClient, err := iam.NewIAMClient(apiKey, "")
 		Expect(iamClient.Client).NotTo(BeNil())
 		Expect(err).NotTo(HaveOccurred())
 
@@ -30,7 +30,7 @@ var _ = Describe("Client", func() {
 
 		It("returns an error", func() {
 
-			iamClient, err := iam.NewIAMClient(apiKey)
+			iamClient, err := iam.NewIAMClient(apiKey, "")
 			Expect(err).To(HaveOccurred())
 			Expect(iamClient).To(BeNil())
 
diff --git a/client/client_test.go b/client/client_test.go
index 370623d..e06b947 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -25,7 +25,7 @@ var _ = Describe("Client", func() {
 
 		BeforeEach(func() {
 			endpointURL = "https://foo.bar"
-			iamClient, err = iam.NewIAMClient("some_key")
+			iamClient, err = iam.NewIAMClient("some_key", "")
 			Expect(err).NotTo(HaveOccurred())
 		})
 
diff --git a/test/integration/channels_test.go b/test/integration/channels_test.go
index 8eba44f..8a2ae75 100644
--- a/test/integration/channels_test.go
+++ b/test/integration/channels_test.go
@@ -20,7 +20,7 @@ var _ = Describe("Channels", func() {
 	BeforeEach(func() {
 		var err error
 		var iamClient *iam.Client
-		iamClient, err = iam.NewIAMClient(testConfig.APIKey)
+		iamClient, err = iam.NewIAMClient(testConfig.APIKey, testConfig.IAMEndpoint)
 		Expect(err).ToNot(HaveOccurred())
 		c, _ = client.New(testConfig.SatConEndpoint, nil, iamClient.Client)
 		Expect(c.Channels).NotTo(BeNil())
diff --git a/test/integration/clusters_test.go b/test/integration/clusters_test.go
index 84441be..1eab3a7 100644
--- a/test/integration/clusters_test.go
+++ b/test/integration/clusters_test.go
@@ -20,7 +20,7 @@ var _ = Describe("Clusters", func() {
 
 	BeforeEach(func() {
 		var err error
-		iamClient, err = iam.NewIAMClient(testConfig.APIKey)
+		iamClient, err = iam.NewIAMClient(testConfig.APIKey, testConfig.IAMEndpoint)
 		Expect(err).ToNot(HaveOccurred())
 		c, _ = client.New(testConfig.SatConEndpoint, nil, iamClient.Client)
 		Expect(c.Clusters).NotTo(BeNil())
diff --git a/test/integration/groups_test.go b/test/integration/groups_test.go
index 506654a..efe464e 100644
--- a/test/integration/groups_test.go
+++ b/test/integration/groups_test.go
@@ -22,7 +22,7 @@ var _ = Describe("Groups", func() {
 
 	BeforeEach(func() {
 		var err error
-		iamClient, err = iam.NewIAMClient(testConfig.APIKey)
+		iamClient, err = iam.NewIAMClient(testConfig.APIKey, testConfig.IAMEndpoint)
 		Expect(err).ToNot(HaveOccurred())
 		c, _ = client.New(testConfig.SatConEndpoint, nil, iamClient.Client)
 		Expect(c.Groups).NotTo(BeNil())
diff --git a/test/integration/subscriptions_test.go b/test/integration/subscriptions_test.go
index 0d90dbd..83ef912 100644
--- a/test/integration/subscriptions_test.go
+++ b/test/integration/subscriptions_test.go
@@ -3,6 +3,7 @@ package integration_test
 import (
 	"encoding/base64"
 	"fmt"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
@@ -20,7 +21,7 @@ var _ = Describe("Subscriptions", func() {
 
 	BeforeEach(func() {
 		var err error
-		iamClient, err = iam.NewIAMClient(testConfig.APIKey)
+		iamClient, err = iam.NewIAMClient(testConfig.APIKey, testConfig.IAMEndpoint)
 		Expect(err).ToNot(HaveOccurred())
 		c, _ = client.New(testConfig.SatConEndpoint, nil, iamClient.Client)
 		Expect(c.Subscriptions).NotTo(BeNil())
diff --git a/test/integration/users_test.go b/test/integration/users_test.go
index 7f45beb..92a4900 100644
--- a/test/integration/users_test.go
+++ b/test/integration/users_test.go
@@ -18,7 +18,7 @@ var _ = Describe("Users", func() {
 
 	BeforeEach(func() {
 		var err error
-		iamClient, err = iam.NewIAMClient(testConfig.APIKey)
+		iamClient, err = iam.NewIAMClient(testConfig.APIKey, testConfig.IAMEndpoint)
 		Expect(err).ToNot(HaveOccurred())
 		c, _ = client.New(testConfig.SatConEndpoint, nil, iamClient.Client)
 		Expect(c.Clusters).NotTo(BeNil())
diff --git a/test/integration/versions_test.go b/test/integration/versions_test.go
index f770ede..7166c74 100644
--- a/test/integration/versions_test.go
+++ b/test/integration/versions_test.go
@@ -22,7 +22,7 @@ var _ = Describe("Versions", func() {
 
 	BeforeEach(func() {
 		var err error
-		iamClient, err = iam.NewIAMClient(testConfig.APIKey)
+		iamClient, err = iam.NewIAMClient(testConfig.APIKey, testConfig.IAMEndpoint)
 		Expect(err).ToNot(HaveOccurred())
 		c, _ = client.New(testConfig.SatConEndpoint, nil, iamClient.Client)
 		Expect(c.Versions).NotTo(BeNil())