diff --git a/programs/test/CMakeLists.txt b/programs/test/CMakeLists.txt
index 6791ffd..994e92c 100644
--- a/programs/test/CMakeLists.txt
+++ b/programs/test/CMakeLists.txt
@@ -17,8 +17,8 @@
 target_link_libraries(benchmark ${libs})
 
 if(TEST_CPP)
-	add_executable(header_test header_test.cpp)
-	target_link_libraries(header_test ${libs})
+	add_executable(cpp_dummy_build cpp_dummy_build.cpp)
+	target_link_libraries(cpp_dummy_build ${libs})
 endif()
 
 add_executable(ssl_cert_test ssl_cert_test.c)
diff --git a/programs/test/header_test.cpp b/programs/test/cpp_dummy_build.cpp
similarity index 91%
rename from programs/test/header_test.cpp
rename to programs/test/cpp_dummy_build.cpp
index 69d7c4a..03373a9 100644
--- a/programs/test/header_test.cpp
+++ b/programs/test/cpp_dummy_build.cpp
@@ -1,6 +1,6 @@
 /*
- *  A C++ program that includes all of the mbed TLS header files, in order to
- *  test if no errors are raised in the process.
+ *  This program is a dummy C++ program to ensure Mbed TLS library header files
+ *  can be included and built with a C++ compiler.
  *
  *  Copyright (C) 2018, ARM Limited, All Rights Reserved
  *  SPDX-License-Identifier: Apache-2.0
@@ -108,8 +108,10 @@
 #include "mbedtls/memory_buffer_alloc.h"
 #endif
 
-int main( int argc, char *argv[] )
+int main()
 {
-    (void) argc;
-    (void) argv;
+    mbedtls_platform_context *ctx = NULL;
+    mbedtls_platform_setup(ctx);
+    mbedtls_printf("CPP Build test\n");
+    mbedtls_platform_teardown(ctx);
 }