diff --git a/api/api.go b/api/api.go
index e76231780b..7123c8a687 100644
--- a/api/api.go
+++ b/api/api.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/cleanhttp"
+	"github.com/hashicorp/go-cleanhttp"
 )
 
 // QueryOptions are used to parameterize a query
diff --git a/command/agent/check.go b/command/agent/check.go
index ee0e16d08b..604d75ea4e 100644
--- a/command/agent/check.go
+++ b/command/agent/check.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/armon/circbuf"
-	"github.com/hashicorp/cleanhttp"
+	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/consul/consul/structs"
 )
 
diff --git a/command/agent/http_test.go b/command/agent/http_test.go
index 154007eba9..cdc8fcfdae 100644
--- a/command/agent/http_test.go
+++ b/command/agent/http_test.go
@@ -18,7 +18,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/cleanhttp"
+	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/testutil"
 )
diff --git a/command/agent/ui_endpoint_test.go b/command/agent/ui_endpoint_test.go
index b640776d3b..95e5e0b95a 100644
--- a/command/agent/ui_endpoint_test.go
+++ b/command/agent/ui_endpoint_test.go
@@ -12,7 +12,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/cleanhttp"
+	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/testutil"
 )
diff --git a/testutil/server.go b/testutil/server.go
index 41b27d86f0..7edafc2b44 100644
--- a/testutil/server.go
+++ b/testutil/server.go
@@ -26,7 +26,7 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"github.com/hashicorp/cleanhttp"
+	"github.com/hashicorp/go-cleanhttp"
 )
 
 // offset is used to atomically increment the port numbers.