diff --git a/src/envoy/BUILD b/src/envoy/BUILD
index 8c5d058fe45..1c75af50a75 100644
--- a/src/envoy/BUILD
+++ b/src/envoy/BUILD
@@ -14,4 +14,21 @@
 #
 ################################################################################
 #
-# This file is intended to be empty for repositories.bzl
+cc_test(
+    name = "envoy_test",
+    data = [
+        "@envoy_git//:envoy-testdata",
+    ],
+    copts = [
+        "-include ./external/envoy_git/test/precompiled/precompiled_test.h",
+    ],
+    deps = [
+        "@envoy_git//:envoy-test-lib",
+        "//external:googletest_main",
+    ],
+    args = [
+        #TODO: Make all test pass
+        "--gtest_filter=RouterTest.*",
+    ],
+    linkstatic=1,
+)
diff --git a/src/envoy/repositories.bzl b/src/envoy/repositories.bzl
index ea4aa04a48d..807caecbc8e 100644
--- a/src/envoy/repositories.bzl
+++ b/src/envoy/repositories.bzl
@@ -457,6 +457,8 @@ load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
 
 exports_files(["source/precompiled/precompiled.h"])
 
+package(default_visibility = ["//visibility:public"])
+
 genrule(
     name = "envoy-ratelimit-proto",
     srcs = [
@@ -557,7 +559,6 @@ cc_binary(
         "source/exe/main.cc",
     ],
     copts = [
-        "-I./external/envoy_git/include",
         "-I./external/envoy_git/source",
         "-include ./external/envoy_git/source/precompiled/precompiled.h",
     ],
@@ -567,26 +568,45 @@ cc_binary(
     linkstatic=1,
 )
 
-cc_test(
-    name = "envoy-test",
+cc_library(
+    name = "envoy-test-lib",
     srcs = glob([
         "test/**/*.cc",
         "test/**/*.h",
     ]),
-    data = glob([
-        "generated/**/*",
-        "test/**/*",
-    ]),
     copts = [
-        "-I./external/envoy_git/include",
         "-I./external/envoy_git/source",
         "-include ./external/envoy_git/test/precompiled/precompiled_test.h",
     ],
+    includes = [
+        "include",
+    ],
     deps = [
         ":envoy-common",
         ":envoy-test-pb",
         "//external:googletest",
     ],
+    alwayslink=1,
+)
+
+filegroup(
+    name = "envoy-testdata",
+    srcs = glob([
+        "generated/**/*",
+        "test/**/*",
+    ]),
+)
+
+cc_test(
+    name = "envoy-test",
+    data = [
+        ":envoy-testdata",
+    ],
+    deps = [
+        ":envoy-test-lib",
+        ":envoy-test-pb",
+        "//external:googletest",
+    ],
     linkstatic=1,
 )"""