diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 26dda5449c..f3a214ecde 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -946,8 +946,8 @@ jobs:
           CXX_STANDARD: '14'
         run: |
           ./ci/do_ci.sh cmake.w3c.trace-context.build-server
-          cd $HOME/build/ext/test/w3c_tracecontext_test
-          ./w3c_tracecontext_test &
+          cd $HOME/build/ext/test/w3c_tracecontext_http_test_server
+          ./w3c_tracecontext_http_test_server &
       - name: Checkout w3c/trace-context repo
         uses: actions/checkout@v4
         with:
diff --git a/ext/test/CMakeLists.txt b/ext/test/CMakeLists.txt
index cc3d4cd1e1..4dabab3821 100644
--- a/ext/test/CMakeLists.txt
+++ b/ext/test/CMakeLists.txt
@@ -3,5 +3,5 @@
 
 add_subdirectory(http)
 if(BUILD_W3CTRACECONTEXT_TEST)
-  add_subdirectory(w3c_tracecontext_test)
+  add_subdirectory(w3c_tracecontext_http_test_server)
 endif()
diff --git a/ext/test/w3c_tracecontext_test/BUILD b/ext/test/w3c_tracecontext_http_test_server/BUILD
similarity index 92%
rename from ext/test/w3c_tracecontext_test/BUILD
rename to ext/test/w3c_tracecontext_http_test_server/BUILD
index c67ab11a9c..8c1c8c17e9 100644
--- a/ext/test/w3c_tracecontext_test/BUILD
+++ b/ext/test/w3c_tracecontext_http_test_server/BUILD
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 cc_binary(
-    name = "w3c_tracecontext_test",
+    name = "w3c_tracecontext_http_test_server",
     srcs = [
         "main.cc",
     ],
diff --git a/ext/test/w3c_tracecontext_test/CMakeLists.txt b/ext/test/w3c_tracecontext_http_test_server/CMakeLists.txt
similarity index 66%
rename from ext/test/w3c_tracecontext_test/CMakeLists.txt
rename to ext/test/w3c_tracecontext_http_test_server/CMakeLists.txt
index cc2ae43b1c..85e3c3eea0 100644
--- a/ext/test/w3c_tracecontext_test/CMakeLists.txt
+++ b/ext/test/w3c_tracecontext_http_test_server/CMakeLists.txt
@@ -3,12 +3,13 @@
 
 include_directories(${CMAKE_SOURCE_DIR}/exporters/ostream/include)
 
-add_executable(w3c_tracecontext_test main.cc)
+add_executable(w3c_tracecontext_http_test_server main.cc)
 target_link_libraries(
-  w3c_tracecontext_test
+  w3c_tracecontext_http_test_server
   PRIVATE ${CMAKE_THREAD_LIBS_INIT} opentelemetry_trace
           opentelemetry_http_client_curl opentelemetry_exporter_ostream_span
           ${CURL_LIBRARIES} nlohmann_json::nlohmann_json)
 if(nlohmann_json_clone)
-  add_dependencies(w3c_tracecontext_test nlohmann_json::nlohmann_json)
+  add_dependencies(w3c_tracecontext_http_test_server
+                   nlohmann_json::nlohmann_json)
 endif()
diff --git a/ext/test/w3c_tracecontext_test/Dockerfile b/ext/test/w3c_tracecontext_http_test_server/Dockerfile
similarity index 100%
rename from ext/test/w3c_tracecontext_test/Dockerfile
rename to ext/test/w3c_tracecontext_http_test_server/Dockerfile
diff --git a/ext/test/w3c_tracecontext_test/README.md b/ext/test/w3c_tracecontext_http_test_server/README.md
similarity index 94%
rename from ext/test/w3c_tracecontext_test/README.md
rename to ext/test/w3c_tracecontext_http_test_server/README.md
index 6f4db4513d..afe2a68638 100644
--- a/ext/test/w3c_tracecontext_test/README.md
+++ b/ext/test/w3c_tracecontext_http_test_server/README.md
@@ -11,7 +11,7 @@ instructions](https://github.com/w3c/trace-context/tree/master/test#implement-te
 1: Build and start the test service endpoint:
 
 ```sh
-./w3c_tracecontext_test
+./w3c_tracecontext_http_test_server
 
 Listening to http://localhost:30000/test
 ```
@@ -19,7 +19,7 @@ Listening to http://localhost:30000/test
 A custom port number for the test service to listen to can be specified:
 
 ```sh
-./w3c_tracecontext_test 31339
+./w3c_tracecontext_http_test_server 31339
 
 Listening to http://localhost:31339/test
 ```
diff --git a/ext/test/w3c_tracecontext_test/main.cc b/ext/test/w3c_tracecontext_http_test_server/main.cc
similarity index 99%
rename from ext/test/w3c_tracecontext_test/main.cc
rename to ext/test/w3c_tracecontext_http_test_server/main.cc
index d2ed772510..5af8c141de 100644
--- a/ext/test/w3c_tracecontext_test/main.cc
+++ b/ext/test/w3c_tracecontext_http_test_server/main.cc
@@ -98,7 +98,7 @@ void initTracer()
 nostd::shared_ptr<trace_api::Tracer> get_tracer()
 {
   auto provider = trace_api::Provider::GetTracerProvider();
-  return provider->GetTracer("w3c_tracecontext_test");
+  return provider->GetTracer("w3c_tracecontext_http_test_server");
 }
 
 struct Uri