diff --git a/tracing/opentracing/http.go b/tracing/opentracing/http.go
index 09dd7149a..b598a3e2d 100644
--- a/tracing/opentracing/http.go
+++ b/tracing/opentracing/http.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/opentracing/opentracing-go"
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/opentracing/opentracing-go/ext"
 
 	"github.com/go-kit/kit/log"
@@ -36,7 +36,7 @@ func ContextToHTTP(tracer opentracing.Tracer, logger log.Logger) kithttp.Request
 			// There's nothing we can do with any errors here.
 			if err = tracer.Inject(
 				span.Context(),
-				opentracing.TextMap,
+				opentracing.HTTPHeaders,
 				opentracing.HTTPHeadersCarrier(req.Header),
 			); err != nil {
 				logger.Log("err", err)
@@ -56,7 +56,7 @@ func HTTPToContext(tracer opentracing.Tracer, operationName string, logger log.L
 		// Try to join to a trace propagated in `req`.
 		var span opentracing.Span
 		wireContext, err := tracer.Extract(
-			opentracing.TextMap,
+			opentracing.HTTPHeaders,
 			opentracing.HTTPHeadersCarrier(req.Header),
 		)
 		if err != nil && err != opentracing.ErrSpanContextNotFound {
diff --git a/tracing/opentracing/http_test.go b/tracing/opentracing/http_test.go
index 548777e78..7d5571e05 100644
--- a/tracing/opentracing/http_test.go
+++ b/tracing/opentracing/http_test.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/opentracing/opentracing-go"
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/opentracing/opentracing-go/ext"
 	"github.com/opentracing/opentracing-go/mocktracer"
 
@@ -89,7 +89,7 @@ func TestHTTPToContextTags(t *testing.T) {
 	parentSpan := tracer.StartSpan("to_extract").(*mocktracer.MockSpan)
 	defer parentSpan.Finish()
 	req, _ := http.NewRequest("GET", "http://test.biz/path", nil)
-	tracer.Inject(parentSpan.Context(), opentracing.TextMap, opentracing.HTTPHeadersCarrier(req.Header))
+	tracer.Inject(parentSpan.Context(), opentracing.HTTPHeaders, opentracing.HTTPHeadersCarrier(req.Header))
 
 	ctx := kitot.HTTPToContext(tracer, "op", log.NewNopLogger())(context.Background(), req)
 	opentracing.SpanFromContext(ctx).Finish()