diff --git a/tracing/opentracing/endpoint_test.go b/tracing/opentracing/endpoint_test.go
index 0bcf422..f1cc520 100644
--- a/tracing/opentracing/endpoint_test.go
+++ b/tracing/opentracing/endpoint_test.go
@@ -33,8 +33,8 @@
 	if want, have := "testOp", endpointSpan.OperationName; want != have {
 		t.Fatalf("Want %q, have %q", want, have)
 	}
-	contextContext := contextSpan.Context().(*mocktracer.MockSpanContext)
-	endpointContext := endpointSpan.Context().(*mocktracer.MockSpanContext)
+	contextContext := contextSpan.Context().(mocktracer.MockSpanContext)
+	endpointContext := endpointSpan.Context().(mocktracer.MockSpanContext)
 	// ...and that the ID is unmodified.
 	if want, have := contextContext.SpanID, endpointContext.SpanID; want != have {
 		t.Errorf("Want SpanID %q, have %q", want, have)
@@ -86,8 +86,8 @@
 		t.Fatalf("Want %q, have %q", want, have)
 	}
 
-	parentContext := parentSpan.Context().(*mocktracer.MockSpanContext)
-	endpointContext := parentSpan.Context().(*mocktracer.MockSpanContext)
+	parentContext := parentSpan.Context().(mocktracer.MockSpanContext)
+	endpointContext := parentSpan.Context().(mocktracer.MockSpanContext)
 
 	// ... and that the parent ID is set appropriately.
 	if want, have := parentContext.SpanID, endpointContext.SpanID; want != have {
diff --git a/tracing/opentracing/grpc_test.go b/tracing/opentracing/grpc_test.go
index d664dd6..4f4d1c8 100644
--- a/tracing/opentracing/grpc_test.go
+++ b/tracing/opentracing/grpc_test.go
@@ -19,7 +19,7 @@
 	// Initialize the ctx with a Span to inject.
 	beforeSpan := tracer.StartSpan("to_inject").(*mocktracer.MockSpan)
 	defer beforeSpan.Finish()
-	beforeSpan.Context().SetBaggageItem("baggage", "check")
+	beforeSpan.SetBaggageItem("baggage", "check")
 	beforeCtx := opentracing.ContextWithSpan(context.Background(), beforeSpan)
 
 	toGRPCFunc := kitot.ToGRPCRequest(tracer, logger)
@@ -44,8 +44,8 @@
 	joinCtx := fromGRPCFunc(afterCtx, &md)
 	joinedSpan := opentracing.SpanFromContext(joinCtx).(*mocktracer.MockSpan)
 
-	joinedContext := joinedSpan.Context().(*mocktracer.MockSpanContext)
-	beforeContext := beforeSpan.Context().(*mocktracer.MockSpanContext)
+	joinedContext := joinedSpan.Context().(mocktracer.MockSpanContext)
+	beforeContext := beforeSpan.Context().(mocktracer.MockSpanContext)
 
 	if joinedContext.SpanID == beforeContext.SpanID {
 		t.Error("SpanID should have changed", joinedContext.SpanID, beforeContext.SpanID)
@@ -58,7 +58,7 @@
 	if want, have := "joined", joinedSpan.OperationName; want != have {
 		t.Errorf("Want %q, have %q", want, have)
 	}
-	if want, have := "check", joinedSpan.Context().BaggageItem("baggage"); want != have {
+	if want, have := "check", joinedSpan.BaggageItem("baggage"); want != have {
 		t.Errorf("Want %q, have %q", want, have)
 	}
 }
diff --git a/tracing/opentracing/http_test.go b/tracing/opentracing/http_test.go
index 05f1111..c08e5af 100644
--- a/tracing/opentracing/http_test.go
+++ b/tracing/opentracing/http_test.go
@@ -19,7 +19,7 @@
 	// Initialize the ctx with a Span to inject.
 	beforeSpan := tracer.StartSpan("to_inject").(*mocktracer.MockSpan)
 	defer beforeSpan.Finish()
-	beforeSpan.Context().SetBaggageItem("baggage", "check")
+	beforeSpan.SetBaggageItem("baggage", "check")
 	beforeCtx := opentracing.ContextWithSpan(context.Background(), beforeSpan)
 
 	toHTTPFunc := kitot.ToHTTPRequest(tracer, logger)
@@ -44,8 +44,8 @@
 	joinCtx := fromHTTPFunc(afterCtx, req)
 	joinedSpan := opentracing.SpanFromContext(joinCtx).(*mocktracer.MockSpan)
 
-	joinedContext := joinedSpan.Context().(*mocktracer.MockSpanContext)
-	beforeContext := beforeSpan.Context().(*mocktracer.MockSpanContext)
+	joinedContext := joinedSpan.Context().(mocktracer.MockSpanContext)
+	beforeContext := beforeSpan.Context().(mocktracer.MockSpanContext)
 
 	if joinedContext.SpanID == beforeContext.SpanID {
 		t.Error("SpanID should have changed", joinedContext.SpanID, beforeContext.SpanID)
@@ -58,7 +58,7 @@
 	if want, have := "joined", joinedSpan.OperationName; want != have {
 		t.Errorf("Want %q, have %q", want, have)
 	}
-	if want, have := "check", joinedSpan.Context().BaggageItem("baggage"); want != have {
+	if want, have := "check", joinedSpan.BaggageItem("baggage"); want != have {
 		t.Errorf("Want %q, have %q", want, have)
 	}
 }