diff --git a/.gitignore b/.gitignore
index 0de5d4fcf236..afa2f3df7815 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
 /ci/bazel-*
 /ci/prebuilt/thirdparty
 /ci/prebuilt/thirdparty_build
-BUILD
 cscope.*
 BROWSE
 .deps
diff --git a/BUILD.wip b/BUILD
similarity index 100%
rename from BUILD.wip
rename to BUILD
diff --git a/bazel/BUILD.wip b/bazel/BUILD
similarity index 100%
rename from bazel/BUILD.wip
rename to bazel/BUILD
diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl
index cec452ff3c00..6f6e0d31f32c 100644
--- a/bazel/envoy_build_system.bzl
+++ b/bazel/envoy_build_system.bzl
@@ -56,6 +56,8 @@ def envoy_cc_library(name,
 def envoy_cc_binary(name,
                     srcs = [],
                     data = [],
+                    linkstatic = 0,
+                    visibility = None,
                     deps = []):
     native.cc_binary(
         name = name,
@@ -66,7 +68,8 @@ def envoy_cc_binary(name,
             "-pthread",
             "-lrt",
         ],
-        linkstatic = 1,
+        linkstatic = linkstatic,
+        visibility = visibility,
         deps = deps + [
             "//source/precompiled:precompiled_includes",
         ],
diff --git a/bazel/sync-from-wip.sh b/bazel/sync-from-wip.sh
deleted file mode 100755
index 28546fc99b93..000000000000
--- a/bazel/sync-from-wip.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Copy all BUILD.wip files to BUILD.
-for n in `find . -name BUILD.wip`;
-do
-  cp -f $n $(dirname $n)/BUILD
-done
diff --git a/bazel/sync-to-wip.sh b/bazel/sync-to-wip.sh
deleted file mode 100755
index 548d78e54380..000000000000
--- a/bazel/sync-to-wip.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Copy all BUILD files to BUILD.wip and stage in git index.
-for n in `find . -name BUILD`;
-do
-  cp -f $n $n.wip
-  git add $n.wip
-done
diff --git a/ci/prebuilt/BUILD.wip b/ci/prebuilt/BUILD
similarity index 100%
rename from ci/prebuilt/BUILD.wip
rename to ci/prebuilt/BUILD
diff --git a/include/envoy/access_log/BUILD.wip b/include/envoy/access_log/BUILD
similarity index 100%
rename from include/envoy/access_log/BUILD.wip
rename to include/envoy/access_log/BUILD
diff --git a/include/envoy/api/BUILD.wip b/include/envoy/api/BUILD
similarity index 100%
rename from include/envoy/api/BUILD.wip
rename to include/envoy/api/BUILD
diff --git a/include/envoy/buffer/BUILD.wip b/include/envoy/buffer/BUILD
similarity index 100%
rename from include/envoy/buffer/BUILD.wip
rename to include/envoy/buffer/BUILD
diff --git a/include/envoy/common/BUILD.wip b/include/envoy/common/BUILD
similarity index 100%
rename from include/envoy/common/BUILD.wip
rename to include/envoy/common/BUILD
diff --git a/include/envoy/event/BUILD.wip b/include/envoy/event/BUILD
similarity index 100%
rename from include/envoy/event/BUILD.wip
rename to include/envoy/event/BUILD
diff --git a/include/envoy/filesystem/BUILD.wip b/include/envoy/filesystem/BUILD
similarity index 100%
rename from include/envoy/filesystem/BUILD.wip
rename to include/envoy/filesystem/BUILD
diff --git a/include/envoy/grpc/BUILD.wip b/include/envoy/grpc/BUILD
similarity index 100%
rename from include/envoy/grpc/BUILD.wip
rename to include/envoy/grpc/BUILD
diff --git a/include/envoy/http/BUILD.wip b/include/envoy/http/BUILD
similarity index 100%
rename from include/envoy/http/BUILD.wip
rename to include/envoy/http/BUILD
diff --git a/include/envoy/init/BUILD.wip b/include/envoy/init/BUILD
similarity index 100%
rename from include/envoy/init/BUILD.wip
rename to include/envoy/init/BUILD
diff --git a/include/envoy/json/BUILD.wip b/include/envoy/json/BUILD
similarity index 100%
rename from include/envoy/json/BUILD.wip
rename to include/envoy/json/BUILD
diff --git a/include/envoy/local_info/BUILD.wip b/include/envoy/local_info/BUILD
similarity index 100%
rename from include/envoy/local_info/BUILD.wip
rename to include/envoy/local_info/BUILD
diff --git a/include/envoy/mongo/BUILD.wip b/include/envoy/mongo/BUILD
similarity index 100%
rename from include/envoy/mongo/BUILD.wip
rename to include/envoy/mongo/BUILD
diff --git a/include/envoy/network/BUILD.wip b/include/envoy/network/BUILD
similarity index 100%
rename from include/envoy/network/BUILD.wip
rename to include/envoy/network/BUILD
diff --git a/include/envoy/ratelimit/BUILD.wip b/include/envoy/ratelimit/BUILD
similarity index 100%
rename from include/envoy/ratelimit/BUILD.wip
rename to include/envoy/ratelimit/BUILD
diff --git a/include/envoy/redis/BUILD.wip b/include/envoy/redis/BUILD
similarity index 100%
rename from include/envoy/redis/BUILD.wip
rename to include/envoy/redis/BUILD
diff --git a/include/envoy/router/BUILD.wip b/include/envoy/router/BUILD
similarity index 100%
rename from include/envoy/router/BUILD.wip
rename to include/envoy/router/BUILD
diff --git a/include/envoy/runtime/BUILD.wip b/include/envoy/runtime/BUILD
similarity index 100%
rename from include/envoy/runtime/BUILD.wip
rename to include/envoy/runtime/BUILD
diff --git a/include/envoy/server/BUILD.wip b/include/envoy/server/BUILD
similarity index 100%
rename from include/envoy/server/BUILD.wip
rename to include/envoy/server/BUILD
diff --git a/include/envoy/ssl/BUILD.wip b/include/envoy/ssl/BUILD
similarity index 100%
rename from include/envoy/ssl/BUILD.wip
rename to include/envoy/ssl/BUILD
diff --git a/include/envoy/stats/BUILD.wip b/include/envoy/stats/BUILD
similarity index 100%
rename from include/envoy/stats/BUILD.wip
rename to include/envoy/stats/BUILD
diff --git a/include/envoy/thread/BUILD.wip b/include/envoy/thread/BUILD
similarity index 100%
rename from include/envoy/thread/BUILD.wip
rename to include/envoy/thread/BUILD
diff --git a/include/envoy/thread_local/BUILD.wip b/include/envoy/thread_local/BUILD
similarity index 100%
rename from include/envoy/thread_local/BUILD.wip
rename to include/envoy/thread_local/BUILD
diff --git a/include/envoy/tracing/BUILD.wip b/include/envoy/tracing/BUILD
similarity index 100%
rename from include/envoy/tracing/BUILD.wip
rename to include/envoy/tracing/BUILD
diff --git a/include/envoy/upstream/BUILD.wip b/include/envoy/upstream/BUILD
similarity index 100%
rename from include/envoy/upstream/BUILD.wip
rename to include/envoy/upstream/BUILD
diff --git a/source/common/access_log/BUILD.wip b/source/common/access_log/BUILD
similarity index 100%
rename from source/common/access_log/BUILD.wip
rename to source/common/access_log/BUILD
diff --git a/source/common/api/BUILD.wip b/source/common/api/BUILD
similarity index 100%
rename from source/common/api/BUILD.wip
rename to source/common/api/BUILD
diff --git a/source/common/buffer/BUILD.wip b/source/common/buffer/BUILD
similarity index 100%
rename from source/common/buffer/BUILD.wip
rename to source/common/buffer/BUILD
diff --git a/source/common/common/BUILD.wip b/source/common/common/BUILD
similarity index 100%
rename from source/common/common/BUILD.wip
rename to source/common/common/BUILD
diff --git a/source/common/dynamo/BUILD.wip b/source/common/dynamo/BUILD
similarity index 100%
rename from source/common/dynamo/BUILD.wip
rename to source/common/dynamo/BUILD
diff --git a/source/common/event/BUILD.wip b/source/common/event/BUILD
similarity index 100%
rename from source/common/event/BUILD.wip
rename to source/common/event/BUILD
diff --git a/source/common/filesystem/BUILD.wip b/source/common/filesystem/BUILD
similarity index 100%
rename from source/common/filesystem/BUILD.wip
rename to source/common/filesystem/BUILD
diff --git a/source/common/filter/BUILD.wip b/source/common/filter/BUILD
similarity index 100%
rename from source/common/filter/BUILD.wip
rename to source/common/filter/BUILD
diff --git a/source/common/filter/auth/BUILD.wip b/source/common/filter/auth/BUILD
similarity index 100%
rename from source/common/filter/auth/BUILD.wip
rename to source/common/filter/auth/BUILD
diff --git a/source/common/grpc/BUILD.wip b/source/common/grpc/BUILD
similarity index 100%
rename from source/common/grpc/BUILD.wip
rename to source/common/grpc/BUILD
diff --git a/source/common/http/BUILD.wip b/source/common/http/BUILD
similarity index 100%
rename from source/common/http/BUILD.wip
rename to source/common/http/BUILD
diff --git a/source/common/http/access_log/BUILD.wip b/source/common/http/access_log/BUILD
similarity index 100%
rename from source/common/http/access_log/BUILD.wip
rename to source/common/http/access_log/BUILD
diff --git a/source/common/http/filter/BUILD.wip b/source/common/http/filter/BUILD
similarity index 100%
rename from source/common/http/filter/BUILD.wip
rename to source/common/http/filter/BUILD
diff --git a/source/common/http/http1/BUILD.wip b/source/common/http/http1/BUILD
similarity index 100%
rename from source/common/http/http1/BUILD.wip
rename to source/common/http/http1/BUILD
diff --git a/source/common/http/http2/BUILD.wip b/source/common/http/http2/BUILD
similarity index 100%
rename from source/common/http/http2/BUILD.wip
rename to source/common/http/http2/BUILD
diff --git a/source/common/json/BUILD.wip b/source/common/json/BUILD
similarity index 100%
rename from source/common/json/BUILD.wip
rename to source/common/json/BUILD
diff --git a/source/common/local_info/BUILD.wip b/source/common/local_info/BUILD
similarity index 100%
rename from source/common/local_info/BUILD.wip
rename to source/common/local_info/BUILD
diff --git a/source/common/memory/BUILD.wip b/source/common/memory/BUILD
similarity index 100%
rename from source/common/memory/BUILD.wip
rename to source/common/memory/BUILD
diff --git a/source/common/mongo/BUILD.wip b/source/common/mongo/BUILD
similarity index 100%
rename from source/common/mongo/BUILD.wip
rename to source/common/mongo/BUILD
diff --git a/source/common/network/BUILD.wip b/source/common/network/BUILD
similarity index 100%
rename from source/common/network/BUILD.wip
rename to source/common/network/BUILD
diff --git a/source/common/profiler/BUILD.wip b/source/common/profiler/BUILD
similarity index 100%
rename from source/common/profiler/BUILD.wip
rename to source/common/profiler/BUILD
diff --git a/source/common/ratelimit/BUILD.wip b/source/common/ratelimit/BUILD
similarity index 100%
rename from source/common/ratelimit/BUILD.wip
rename to source/common/ratelimit/BUILD
diff --git a/source/common/redis/BUILD.wip b/source/common/redis/BUILD
similarity index 100%
rename from source/common/redis/BUILD.wip
rename to source/common/redis/BUILD
diff --git a/source/common/router/BUILD.wip b/source/common/router/BUILD
similarity index 100%
rename from source/common/router/BUILD.wip
rename to source/common/router/BUILD
diff --git a/source/common/runtime/BUILD.wip b/source/common/runtime/BUILD
similarity index 100%
rename from source/common/runtime/BUILD.wip
rename to source/common/runtime/BUILD
diff --git a/source/common/ssl/BUILD.wip b/source/common/ssl/BUILD
similarity index 100%
rename from source/common/ssl/BUILD.wip
rename to source/common/ssl/BUILD
diff --git a/source/common/stats/BUILD.wip b/source/common/stats/BUILD
similarity index 100%
rename from source/common/stats/BUILD.wip
rename to source/common/stats/BUILD
diff --git a/source/common/thread_local/BUILD.wip b/source/common/thread_local/BUILD
similarity index 100%
rename from source/common/thread_local/BUILD.wip
rename to source/common/thread_local/BUILD
diff --git a/source/common/tracing/BUILD.wip b/source/common/tracing/BUILD
similarity index 100%
rename from source/common/tracing/BUILD.wip
rename to source/common/tracing/BUILD
diff --git a/source/common/upstream/BUILD.wip b/source/common/upstream/BUILD
similarity index 100%
rename from source/common/upstream/BUILD.wip
rename to source/common/upstream/BUILD
diff --git a/source/exe/BUILD.wip b/source/exe/BUILD
similarity index 87%
rename from source/exe/BUILD.wip
rename to source/exe/BUILD
index 81679b3b16e0..3d6a1ab0a5ed 100644
--- a/source/exe/BUILD.wip
+++ b/source/exe/BUILD
@@ -4,9 +4,18 @@ load("//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_cc_binary")
 
 envoy_cc_binary(
     name = "envoy",
-    srcs = ["main.cc"],
+    deps = ["envoy_main_lib"],
+)
+
+envoy_cc_binary(
+    name = "envoy-static",
+    linkstatic = 1,
+    deps = ["envoy_main_lib"],
+)
+
+envoy_cc_library(
+    name = "envoy_common_lib",
     deps = [
-        ":hot_restart_lib",
         "//source/common/event:libevent_lib",
         "//source/common/local_info:local_info_lib",
         "//source/common/network:utility_lib",
@@ -33,6 +42,15 @@ envoy_cc_binary(
     ],
 )
 
+envoy_cc_library(
+    name = "envoy_main_lib",
+    srcs = ["main.cc"],
+    deps = [
+        ":envoy_common_lib",
+        ":hot_restart_lib",
+    ],
+)
+
 envoy_cc_library(
     name = "hot_restart_lib",
     srcs = ["hot_restart.cc"],
diff --git a/source/precompiled/BUILD.wip b/source/precompiled/BUILD
similarity index 100%
rename from source/precompiled/BUILD.wip
rename to source/precompiled/BUILD
diff --git a/source/server/BUILD.wip b/source/server/BUILD
similarity index 100%
rename from source/server/BUILD.wip
rename to source/server/BUILD
diff --git a/source/server/config/BUILD.wip b/source/server/config/BUILD
similarity index 100%
rename from source/server/config/BUILD.wip
rename to source/server/config/BUILD
diff --git a/source/server/config/http/BUILD.wip b/source/server/config/http/BUILD
similarity index 100%
rename from source/server/config/http/BUILD.wip
rename to source/server/config/http/BUILD
diff --git a/source/server/config/network/BUILD.wip b/source/server/config/network/BUILD
similarity index 100%
rename from source/server/config/network/BUILD.wip
rename to source/server/config/network/BUILD
diff --git a/source/server/http/BUILD.wip b/source/server/http/BUILD
similarity index 100%
rename from source/server/http/BUILD.wip
rename to source/server/http/BUILD
diff --git a/test/BUILD.wip b/test/BUILD
similarity index 100%
rename from test/BUILD.wip
rename to test/BUILD
diff --git a/test/certs/BUILD.wip b/test/certs/BUILD
similarity index 100%
rename from test/certs/BUILD.wip
rename to test/certs/BUILD
diff --git a/test/common/access_log/BUILD.wip b/test/common/access_log/BUILD
similarity index 100%
rename from test/common/access_log/BUILD.wip
rename to test/common/access_log/BUILD
diff --git a/test/common/api/BUILD.wip b/test/common/api/BUILD
similarity index 100%
rename from test/common/api/BUILD.wip
rename to test/common/api/BUILD
diff --git a/test/common/common/BUILD.wip b/test/common/common/BUILD
similarity index 100%
rename from test/common/common/BUILD.wip
rename to test/common/common/BUILD
diff --git a/test/common/dynamo/BUILD.wip b/test/common/dynamo/BUILD
similarity index 100%
rename from test/common/dynamo/BUILD.wip
rename to test/common/dynamo/BUILD
diff --git a/test/common/event/BUILD.wip b/test/common/event/BUILD
similarity index 100%
rename from test/common/event/BUILD.wip
rename to test/common/event/BUILD
diff --git a/test/common/filesystem/BUILD.wip b/test/common/filesystem/BUILD
similarity index 100%
rename from test/common/filesystem/BUILD.wip
rename to test/common/filesystem/BUILD
diff --git a/test/common/filter/BUILD.wip b/test/common/filter/BUILD
similarity index 100%
rename from test/common/filter/BUILD.wip
rename to test/common/filter/BUILD
diff --git a/test/common/filter/auth/BUILD.wip b/test/common/filter/auth/BUILD
similarity index 100%
rename from test/common/filter/auth/BUILD.wip
rename to test/common/filter/auth/BUILD
diff --git a/test/common/grpc/BUILD.wip b/test/common/grpc/BUILD
similarity index 100%
rename from test/common/grpc/BUILD.wip
rename to test/common/grpc/BUILD
diff --git a/test/common/http/BUILD.wip b/test/common/http/BUILD
similarity index 100%
rename from test/common/http/BUILD.wip
rename to test/common/http/BUILD
diff --git a/test/common/http/access_log/BUILD.wip b/test/common/http/access_log/BUILD
similarity index 100%
rename from test/common/http/access_log/BUILD.wip
rename to test/common/http/access_log/BUILD
diff --git a/test/common/http/filter/BUILD.wip b/test/common/http/filter/BUILD
similarity index 100%
rename from test/common/http/filter/BUILD.wip
rename to test/common/http/filter/BUILD
diff --git a/test/common/http/http1/BUILD.wip b/test/common/http/http1/BUILD
similarity index 100%
rename from test/common/http/http1/BUILD.wip
rename to test/common/http/http1/BUILD
diff --git a/test/common/http/http2/BUILD.wip b/test/common/http/http2/BUILD
similarity index 100%
rename from test/common/http/http2/BUILD.wip
rename to test/common/http/http2/BUILD
diff --git a/test/common/json/BUILD.wip b/test/common/json/BUILD
similarity index 100%
rename from test/common/json/BUILD.wip
rename to test/common/json/BUILD
diff --git a/test/common/mongo/BUILD.wip b/test/common/mongo/BUILD
similarity index 100%
rename from test/common/mongo/BUILD.wip
rename to test/common/mongo/BUILD
diff --git a/test/common/network/BUILD.wip b/test/common/network/BUILD
similarity index 100%
rename from test/common/network/BUILD.wip
rename to test/common/network/BUILD
diff --git a/test/common/ratelimit/BUILD.wip b/test/common/ratelimit/BUILD
similarity index 100%
rename from test/common/ratelimit/BUILD.wip
rename to test/common/ratelimit/BUILD
diff --git a/test/common/redis/BUILD.wip b/test/common/redis/BUILD
similarity index 100%
rename from test/common/redis/BUILD.wip
rename to test/common/redis/BUILD
diff --git a/test/common/router/BUILD.wip b/test/common/router/BUILD
similarity index 100%
rename from test/common/router/BUILD.wip
rename to test/common/router/BUILD
diff --git a/test/common/runtime/BUILD.wip b/test/common/runtime/BUILD
similarity index 100%
rename from test/common/runtime/BUILD.wip
rename to test/common/runtime/BUILD
diff --git a/test/common/ssl/BUILD.wip b/test/common/ssl/BUILD
similarity index 100%
rename from test/common/ssl/BUILD.wip
rename to test/common/ssl/BUILD
diff --git a/test/common/ssl/test_data/BUILD.wip b/test/common/ssl/test_data/BUILD
similarity index 100%
rename from test/common/ssl/test_data/BUILD.wip
rename to test/common/ssl/test_data/BUILD
diff --git a/test/common/stats/BUILD.wip b/test/common/stats/BUILD
similarity index 100%
rename from test/common/stats/BUILD.wip
rename to test/common/stats/BUILD
diff --git a/test/common/tracing/BUILD.wip b/test/common/tracing/BUILD
similarity index 100%
rename from test/common/tracing/BUILD.wip
rename to test/common/tracing/BUILD
diff --git a/test/common/upstream/BUILD.wip b/test/common/upstream/BUILD
similarity index 100%
rename from test/common/upstream/BUILD.wip
rename to test/common/upstream/BUILD
diff --git a/test/config/integration/BUILD.wip b/test/config/integration/BUILD
similarity index 100%
rename from test/config/integration/BUILD.wip
rename to test/config/integration/BUILD
diff --git a/test/config/integration/certs/BUILD.wip b/test/config/integration/certs/BUILD
similarity index 100%
rename from test/config/integration/certs/BUILD.wip
rename to test/config/integration/certs/BUILD
diff --git a/test/integration/BUILD.wip b/test/integration/BUILD
similarity index 100%
rename from test/integration/BUILD.wip
rename to test/integration/BUILD
diff --git a/test/mocks/BUILD.wip b/test/mocks/BUILD
similarity index 100%
rename from test/mocks/BUILD.wip
rename to test/mocks/BUILD
diff --git a/test/mocks/access_log/BUILD.wip b/test/mocks/access_log/BUILD
similarity index 100%
rename from test/mocks/access_log/BUILD.wip
rename to test/mocks/access_log/BUILD
diff --git a/test/mocks/api/BUILD.wip b/test/mocks/api/BUILD
similarity index 100%
rename from test/mocks/api/BUILD.wip
rename to test/mocks/api/BUILD
diff --git a/test/mocks/buffer/BUILD.wip b/test/mocks/buffer/BUILD
similarity index 100%
rename from test/mocks/buffer/BUILD.wip
rename to test/mocks/buffer/BUILD
diff --git a/test/mocks/event/BUILD.wip b/test/mocks/event/BUILD
similarity index 100%
rename from test/mocks/event/BUILD.wip
rename to test/mocks/event/BUILD
diff --git a/test/mocks/filesystem/BUILD.wip b/test/mocks/filesystem/BUILD
similarity index 100%
rename from test/mocks/filesystem/BUILD.wip
rename to test/mocks/filesystem/BUILD
diff --git a/test/mocks/grpc/BUILD.wip b/test/mocks/grpc/BUILD
similarity index 100%
rename from test/mocks/grpc/BUILD.wip
rename to test/mocks/grpc/BUILD
diff --git a/test/mocks/http/BUILD.wip b/test/mocks/http/BUILD
similarity index 100%
rename from test/mocks/http/BUILD.wip
rename to test/mocks/http/BUILD
diff --git a/test/mocks/init/BUILD.wip b/test/mocks/init/BUILD
similarity index 100%
rename from test/mocks/init/BUILD.wip
rename to test/mocks/init/BUILD
diff --git a/test/mocks/local_info/BUILD.wip b/test/mocks/local_info/BUILD
similarity index 100%
rename from test/mocks/local_info/BUILD.wip
rename to test/mocks/local_info/BUILD
diff --git a/test/mocks/network/BUILD.wip b/test/mocks/network/BUILD
similarity index 100%
rename from test/mocks/network/BUILD.wip
rename to test/mocks/network/BUILD
diff --git a/test/mocks/ratelimit/BUILD.wip b/test/mocks/ratelimit/BUILD
similarity index 100%
rename from test/mocks/ratelimit/BUILD.wip
rename to test/mocks/ratelimit/BUILD
diff --git a/test/mocks/redis/BUILD.wip b/test/mocks/redis/BUILD
similarity index 100%
rename from test/mocks/redis/BUILD.wip
rename to test/mocks/redis/BUILD
diff --git a/test/mocks/router/BUILD.wip b/test/mocks/router/BUILD
similarity index 100%
rename from test/mocks/router/BUILD.wip
rename to test/mocks/router/BUILD
diff --git a/test/mocks/runtime/BUILD.wip b/test/mocks/runtime/BUILD
similarity index 100%
rename from test/mocks/runtime/BUILD.wip
rename to test/mocks/runtime/BUILD
diff --git a/test/mocks/server/BUILD.wip b/test/mocks/server/BUILD
similarity index 100%
rename from test/mocks/server/BUILD.wip
rename to test/mocks/server/BUILD
diff --git a/test/mocks/ssl/BUILD.wip b/test/mocks/ssl/BUILD
similarity index 100%
rename from test/mocks/ssl/BUILD.wip
rename to test/mocks/ssl/BUILD
diff --git a/test/mocks/stats/BUILD.wip b/test/mocks/stats/BUILD
similarity index 100%
rename from test/mocks/stats/BUILD.wip
rename to test/mocks/stats/BUILD
diff --git a/test/mocks/thread_local/BUILD.wip b/test/mocks/thread_local/BUILD
similarity index 100%
rename from test/mocks/thread_local/BUILD.wip
rename to test/mocks/thread_local/BUILD
diff --git a/test/mocks/tracing/BUILD.wip b/test/mocks/tracing/BUILD
similarity index 100%
rename from test/mocks/tracing/BUILD.wip
rename to test/mocks/tracing/BUILD
diff --git a/test/mocks/upstream/BUILD.wip b/test/mocks/upstream/BUILD
similarity index 100%
rename from test/mocks/upstream/BUILD.wip
rename to test/mocks/upstream/BUILD
diff --git a/test/precompiled/BUILD.wip b/test/precompiled/BUILD
similarity index 100%
rename from test/precompiled/BUILD.wip
rename to test/precompiled/BUILD
diff --git a/test/proto/BUILD.wip b/test/proto/BUILD
similarity index 100%
rename from test/proto/BUILD.wip
rename to test/proto/BUILD
diff --git a/test/server/BUILD.wip b/test/server/BUILD
similarity index 100%
rename from test/server/BUILD.wip
rename to test/server/BUILD
diff --git a/test/server/config/http/BUILD.wip b/test/server/config/http/BUILD
similarity index 100%
rename from test/server/config/http/BUILD.wip
rename to test/server/config/http/BUILD
diff --git a/test/server/config/network/BUILD.wip b/test/server/config/network/BUILD
similarity index 100%
rename from test/server/config/network/BUILD.wip
rename to test/server/config/network/BUILD
diff --git a/test/server/http/BUILD.wip b/test/server/http/BUILD
similarity index 100%
rename from test/server/http/BUILD.wip
rename to test/server/http/BUILD
diff --git a/test/test_common/BUILD.wip b/test/test_common/BUILD
similarity index 100%
rename from test/test_common/BUILD.wip
rename to test/test_common/BUILD