diff --git a/pkg/apis/externaldns/types_test.go b/pkg/apis/externaldns/types_test.go
index 2257f410f0..251a49a6cd 100644
--- a/pkg/apis/externaldns/types_test.go
+++ b/pkg/apis/externaldns/types_test.go
@@ -57,6 +57,7 @@ var (
 		AzureConfigFile:             "/etc/kubernetes/azure.json",
 		AzureResourceGroup:          "",
 		AzureSubscriptionID:         "",
+		BluecatConfigFile:           "/etc/kubernetes/bluecat.json",
 		CloudflareProxied:           false,
 		CloudflareZonesPerPage:      50,
 		CoreDNSPrefix:               "/skydns/",
@@ -130,6 +131,7 @@ var (
 		AzureConfigFile:             "azure.json",
 		AzureResourceGroup:          "arg",
 		AzureSubscriptionID:         "arg",
+		BluecatConfigFile:           "bluecat.json",
 		CloudflareProxied:           true,
 		CloudflareZonesPerPage:      20,
 		CoreDNSPrefix:               "/coredns/",
@@ -218,6 +220,7 @@ func TestParseFlags(t *testing.T) {
 				"--azure-config-file=azure.json",
 				"--azure-resource-group=arg",
 				"--azure-subscription-id=arg",
+				"--bluecat-config-file=bluecat.json",
 				"--cloudflare-proxied",
 				"--cloudflare-zones-per-page=20",
 				"--coredns-prefix=/coredns/",
@@ -305,6 +308,7 @@ func TestParseFlags(t *testing.T) {
 				"EXTERNAL_DNS_AZURE_CONFIG_FILE":               "azure.json",
 				"EXTERNAL_DNS_AZURE_RESOURCE_GROUP":            "arg",
 				"EXTERNAL_DNS_AZURE_SUBSCRIPTION_ID":           "arg",
+				"EXTERNAL_DNS_BLUECAT_CONFIG_FILE":             "bluecat.json",
 				"EXTERNAL_DNS_CLOUDFLARE_PROXIED":              "1",
 				"EXTERNAL_DNS_CLOUDFLARE_ZONES_PER_PAGE":       "20",
 				"EXTERNAL_DNS_COREDNS_PREFIX":                  "/coredns/",
diff --git a/provider/bluecat/bluecat_test.go b/provider/bluecat/bluecat_test.go
index e8d1ca4591..695a79451e 100644
--- a/provider/bluecat/bluecat_test.go
+++ b/provider/bluecat/bluecat_test.go
@@ -2,8 +2,10 @@ package bluecat
 
 import (
 	"context"
+	"net/http"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"sigs.k8s.io/external-dns/endpoint"
@@ -11,15 +13,15 @@ import (
 	"sigs.k8s.io/external-dns/provider"
 )
 
-type mockGatewayClient struct {
-	mockBluecatZones  *[]BluecatZone
-	mockBluecatHosts  *[]BluecatHostRecord
-	mockBluecatCNAMEs *[]BluecatCNAMERecord
-}
+//type mockGatewayClient struct {
+//	mockBluecatZones  *[]BluecatZone
+//	mockBluecatHosts  *[]BluecatHostRecord
+//	mockBluecatCNAMEs *[]BluecatCNAMERecord
+//}
 
-func (g *mockGatewayClient) getBluecatZones() ([]BluecatZone, error) {
-	return *g.mockBluecatZones, nil
-}
+//func (g *mockGatewayClient) getBluecatZones() ([]BluecatZone, error) {
+//	return *g.mockBluecatZones, nil
+//}
 
 func createMockBluecatZone(fqdn string) BluecatZone {
 	return BluecatZone{
@@ -55,18 +57,27 @@ func newBluecatProvider(domainFilter endpoint.DomainFilter, zoneIDFilter provide
 }
 
 func TestBluecatRecords(t *testing.T) {
-	client := mockGatewayClient{
-		mockBluecatZones: &[]BluecatZone{
-			createMockBluecatZone("example.com"),
-		},
-		mockBluecatHosts: &[]BluecatHostRecord{
-			createMockBluecatHostRecord("example.com", "123.123.123.122"),
-			createMockBluecatHostRecord("nginx.example.com", "123.123.123.123"),
-			createMockBluecatHostRecord("whitespace.example.com", "123.123.123.124"),
-		},
-		mockBluecatCNAMEs: &[]BluecatCNAMERecord{
-			createMockBluecatCNAME("hack.example.com", "bluecatnetworks.com"),
-		},
+	//client := mockGatewayClient{
+	//	mockBluecatZones: &[]BluecatZone{
+	//		createMockBluecatZone("example.com"),
+	//	},
+	//	mockBluecatHosts: &[]BluecatHostRecord{
+	//		createMockBluecatHostRecord("example.com", "123.123.123.122"),
+	//		createMockBluecatHostRecord("nginx.example.com", "123.123.123.123"),
+	//		createMockBluecatHostRecord("whitespace.example.com", "123.123.123.124"),
+	//	},
+	//	mockBluecatCNAMEs: &[]BluecatCNAMERecord{
+	//		createMockBluecatCNAME("hack.example.com", "bluecatnetworks.com"),
+	//	},
+	//}
+	client := GatewayClient{
+		Token:            "foo",
+		Host:             "foo",
+		DNSConfiguration: "foo",
+		View:             "foo",
+		RootZone:         "foo",
+		Cookie:           http.Cookie{Name: "mycookie", Value: "SomeValue", Path: "/mysite", Domain: "", Expires: time.Now(), RawExpires: "", MaxAge: 0, Secure: true, HttpOnly: true, Raw: "", Unparsed: []string(nil)},
+		//Cookie:           "foo", // http.Cookie
 	}
 
 	provider := newBluecatProvider(