diff --git a/proto/pbservice/convert_oss.go b/proto/pbservice/convert_oss.go
index 81048ca8d0..f49a84ac7f 100644
--- a/proto/pbservice/convert_oss.go
+++ b/proto/pbservice/convert_oss.go
@@ -1,3 +1,5 @@
+// +build !consulent
+
 package pbservice
 
 import (
diff --git a/proto/pbservice/convert_oss_test.go b/proto/pbservice/convert_oss_test.go
new file mode 100644
index 0000000000..7848e04d02
--- /dev/null
+++ b/proto/pbservice/convert_oss_test.go
@@ -0,0 +1,12 @@
+// +build !consulent
+
+package pbservice
+
+import (
+	fuzz "github.com/google/gofuzz"
+
+	"github.com/hashicorp/consul/agent/structs"
+)
+
+func randEnterpriseMeta(_ *structs.EnterpriseMeta, _ fuzz.Continue) {
+}
diff --git a/proto/pbservice/convert_test.go b/proto/pbservice/convert_test.go
index d2b81fdb3a..24889dc88a 100644
--- a/proto/pbservice/convert_test.go
+++ b/proto/pbservice/convert_test.go
@@ -108,8 +108,3 @@ func randInterface(m *interface{}, c fuzz.Continue) {
 		}
 	}
 }
-
-// TODO(streaming): this is a quick fix to get the tests passing in enterprise.
-// This needs to use a real random value once enterprise support is complete.
-func randEnterpriseMeta(_ *structs.EnterpriseMeta, _ fuzz.Continue) {
-}