diff --git a/build.yaml b/build.yaml
index e33124292a4..7a530de6a56 100644
--- a/build.yaml
+++ b/build.yaml
@@ -2101,6 +2101,7 @@ targets:
   build: test
   language: c++
   headers:
+  - test/cpp/interop/client_helper.h
   - test/cpp/interop/interop_client.h
   - test/cpp/interop/stress_interop_client.h
   src:
diff --git a/test/cpp/interop/stress_interop_client.cc b/test/cpp/interop/stress_interop_client.cc
index 5ade60057b4..a75eb99d426 100644
--- a/test/cpp/interop/stress_interop_client.cc
+++ b/test/cpp/interop/stress_interop_client.cc
@@ -31,6 +31,8 @@
  *is % allowed in string
  */
 
+#include "test/cpp/interop/stress_interop_client.h"
+
 #include <memory>
 #include <string>
 #include <vector>
@@ -38,7 +40,6 @@
 #include <grpc++/create_channel.h>
 
 #include "test/cpp/interop/interop_client.h"
-#include "test/cpp/interop/stress_interop_client.h"
 
 namespace grpc {
 namespace testing {
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 73dc30d6891..1fb1da2239e 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -1665,6 +1665,7 @@
       "grpc_test_util"
     ], 
     "headers": [
+      "test/cpp/interop/client_helper.h", 
       "test/cpp/interop/interop_client.h", 
       "test/cpp/interop/stress_interop_client.h", 
       "test/proto/empty.grpc.pb.h", 
@@ -1677,6 +1678,7 @@
     "language": "c++", 
     "name": "stress_test", 
     "src": [
+      "test/cpp/interop/client_helper.h", 
       "test/cpp/interop/interop_client.cc", 
       "test/cpp/interop/interop_client.h", 
       "test/cpp/interop/stress_interop_client.cc", 
diff --git a/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj b/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj
index ad0e48c1caa..a385a6dce9e 100644
--- a/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj
+++ b/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj
@@ -145,6 +145,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\..\test\cpp\interop\client_helper.h" />
     <ClInclude Include="..\..\..\..\test\cpp\interop\interop_client.h" />
     <ClInclude Include="..\..\..\..\test\cpp\interop\stress_interop_client.h" />
   </ItemGroup>
diff --git a/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj.filters b/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj.filters
index db0b220ea4a..839493a96e8 100644
--- a/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj.filters
+++ b/vsprojects/vcxproj/test/stress_test/stress_test.vcxproj.filters
@@ -21,6 +21,9 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\..\test\cpp\interop\client_helper.h">
+      <Filter>test\cpp\interop</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\test\cpp\interop\interop_client.h">
       <Filter>test\cpp\interop</Filter>
     </ClInclude>