diff --git a/configure.ac b/configure.ac
index f0950ec06..7fb1c0804 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,7 @@ NCCL_NET_OFI_DISTCHCK_CONFIGURE_FLAGS=
 AC_PROG_CC
 AM_PROG_CC_C_O
 m4_version_prereq([2.70], [], [AC_PROG_CC_STDC])
+AC_PROG_CXX
 AC_C_INLINE
 
 dnl ac_check_enable_debug will make sure AC_PROG_CC doesn't add a
diff --git a/m4/check_pkg_mpi.m4 b/m4/check_pkg_mpi.m4
index a89333ad9..1b57b552d 100644
--- a/m4/check_pkg_mpi.m4
+++ b/m4/check_pkg_mpi.m4
@@ -31,6 +31,7 @@ AC_DEFUN([CHECK_PKG_MPI], [
          LDFLAGS="${MPI_LDFLAGS} ${LDFLAGS}"])
 
   MPICC=${mpi_bindir}mpicc
+  MPICXX=${mpi_bindir}mpicxx
 
   AC_MSG_CHECKING([for working mpicc])
   ${MPICC} --help >& AS_MESSAGE_LOG_FD
@@ -38,6 +39,7 @@ AC_DEFUN([CHECK_PKG_MPI], [
         [AC_MSG_RESULT([yes])],
         [AC_MSG_RESULT([no])
          MPICC="${CC}"
+         MPICXX="${CXX}"
          AS_IF([test "${check_pkg_found}" = "yes"],
                [AC_CHECK_HEADERS([mpi.h], [], [check_pkg_found=no])])
 
@@ -49,6 +51,7 @@ AC_DEFUN([CHECK_PKG_MPI], [
         [$2])
 
   AC_SUBST([MPICC])
+  AC_SUBST([MPICXX])
   AC_SUBST([MPI_CPPFLAGS])
   AC_SUBST([MPI_LDFLAGS])
   AC_SUBST([MPI_LIBS])
diff --git a/tests/functional/Makefile.am b/tests/functional/Makefile.am
index b9c819c4d..59e9df8e0 100644
--- a/tests/functional/Makefile.am
+++ b/tests/functional/Makefile.am
@@ -12,13 +12,14 @@ AM_CPPFLAGS += $(MPI_CPPFLAGS) $(CUDA_CPPFLAGS)
 AM_LDFLAGS = $(MPI_LDFLAGS) $(CUDA_LDFLAGS)
 LDADD = $(top_builddir)/src/libinternal_net_plugin.la $(MPI_LIBS) $(CUDA_LIBS)
 CC = $(MPICC)
+CXX = $(MPICXX)
 
-noinst_HEADERS = test-common.h
+noinst_HEADERS = test-common.hpp
 
 if ENABLE_TESTS
 bin_PROGRAMS = nccl_connection nccl_message_transfer ring
 endif
 
-nccl_connection_SOURCES = nccl_connection.c
-nccl_message_transfer_SOURCES = nccl_message_transfer.c
-ring_SOURCES = ring.c
+nccl_connection_SOURCES = nccl_connection.cc
+nccl_message_transfer_SOURCES = nccl_message_transfer.cc
+ring_SOURCES = ring.cc
diff --git a/tests/functional/nccl_connection.c b/tests/functional/nccl_connection.cc
similarity index 99%
rename from tests/functional/nccl_connection.c
rename to tests/functional/nccl_connection.cc
index 8716d543a..6414bdd79 100644
--- a/tests/functional/nccl_connection.c
+++ b/tests/functional/nccl_connection.cc
@@ -8,7 +8,7 @@
 
 #include "config.h"
 
-#include "test-common.h"
+#include "test-common.hpp"
 
 int main(int argc, char* argv[])
 {
diff --git a/tests/functional/nccl_message_transfer.c b/tests/functional/nccl_message_transfer.cc
similarity index 99%
rename from tests/functional/nccl_message_transfer.c
rename to tests/functional/nccl_message_transfer.cc
index 947454ca6..90ccd0f04 100644
--- a/tests/functional/nccl_message_transfer.c
+++ b/tests/functional/nccl_message_transfer.cc
@@ -9,9 +9,7 @@
 
 #include "config.h"
 
-#include "test-common.h"
-
-#define PROC_NAME_IDX(i) (i * MPI_MAX_PROCESSOR_NAME)
+#include "test-common.hpp"
 
 int main(int argc, char* argv[])
 {
@@ -57,6 +55,7 @@ int main(int argc, char* argv[])
 	size_t recv_sizes[] = {4 * 1024, 16 * 1024, 1024 * 1024,
 	                       4 * 1024, 16 * 1024, 1024 * 1024,
 	                       5 * 1024, 17 * 1024, 2 * 1024 * 1024};
+	test_nccl_properties_t props = {};
 
 	/* For grouped recvs */
 	int tag = 1;
@@ -127,7 +126,6 @@ int main(int argc, char* argv[])
 		goto exit;
 	}
 
-	test_nccl_properties_t props = {};
 
 	/* Get Properties for the device */
 	for (int dev = 0; dev < ndev; dev++) {
@@ -392,7 +390,7 @@ int main(int argc, char* argv[])
 	MPI_Finalize();
 	NCCL_OFI_INFO(NCCL_NET, "Test completed successfully for rank %d", rank);
 
-exit:;
+exit:
 
 	ncclResult_t close_res = ncclSuccess;
 
diff --git a/tests/functional/ring.c b/tests/functional/ring.cc
similarity index 99%
rename from tests/functional/ring.c
rename to tests/functional/ring.cc
index 77aac75a6..de4828fe5 100644
--- a/tests/functional/ring.c
+++ b/tests/functional/ring.cc
@@ -4,9 +4,7 @@
 
 #include "config.h"
 
-#include "test-common.h"
-
-#define PROC_NAME_IDX(i) (i * MPI_MAX_PROCESSOR_NAME)
+#include "test-common.hpp"
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/functional/test-common.h b/tests/functional/test-common.hpp
similarity index 98%
rename from tests/functional/test-common.h
rename to tests/functional/test-common.hpp
index 5a3480aa7..d08826b17 100644
--- a/tests/functional/test-common.h
+++ b/tests/functional/test-common.hpp
@@ -20,6 +20,10 @@
 #include <stdarg.h>
 #include <cuda_runtime.h>
 
+
+template <typename T>
+constexpr T PROC_NAME_IDX(T i) { return i * MPI_MAX_PROCESSOR_NAME; };
+
 #define STR2(v)		#v
 #define STR(v)		STR2(v)
 
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 5f6e97d95..d5913ac97 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CPPFLAGS += -isystem $(abs_top_srcdir)/3rd-party/nccl/$(DEVICE_INTERFACE)/include
 AM_CPPFLAGS += -isystem $(abs_top_srcdir)/3rd-party/uthash/include
 LDADD = $(top_builddir)/src/libinternal_net_plugin.la
-noinst_HEADERS = test-common.h
+noinst_HEADERS = test-common.hpp
 
 noinst_PROGRAMS = \
 	deque \
@@ -25,17 +25,17 @@ if WANT_PLATFORM_AWS
   AM_CPPFLAGS += $(CUDA_CPPFLAGS)
   LDADD += $(CUDA_LIBS)
   noinst_PROGRAMS += show_tuner_decisions
-  show_tuner_decisions_SOURCES = show_tuner_decisions.c
+  show_tuner_decisions_SOURCES = show_tuner_decisions.cc
   show_tuner_decisions_LDADD = $(top_builddir)/src/tuner/libinternal_tuner_plugin.la
 endif
 endif
 
-idpool_SOURCES = idpool.c
-deque_SOURCES = deque.c
-freelist_SOURCES = freelist.c
-msgbuff_SOURCES = msgbuff.c
-scheduler_SOURCES = scheduler.c
-ep_addr_list_SOURCES = ep_addr_list.c
-mr_SOURCES = mr.c
+idpool_SOURCES = idpool.cc
+deque_SOURCES = deque.cc
+freelist_SOURCES = freelist.cc
+msgbuff_SOURCES = msgbuff.cc
+scheduler_SOURCES = scheduler.cc
+ep_addr_list_SOURCES = ep_addr_list.cc
+mr_SOURCES = mr.cc
 
 TESTS = $(noinst_PROGRAMS)
diff --git a/tests/unit/deque.c b/tests/unit/deque.cc
similarity index 95%
rename from tests/unit/deque.c
rename to tests/unit/deque.cc
index be356cfcb..7b9650311 100644
--- a/tests/unit/deque.c
+++ b/tests/unit/deque.cc
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "test-common.h"
+#include "test-common.hpp"
 #include "nccl_ofi_deque.h"
 
 #define test_get_front(deque, expected) \
@@ -32,14 +32,13 @@
 
 int main(int argc, char *argv[])
 {
-	const size_t num_elem = 11;
+	constexpr size_t num_elem = 11;
 	struct elem_t {
 		nccl_ofi_deque_elem_t de;
 		int v;
 	} elems[num_elem];
 
 	nccl_ofi_deque_elem_t *deque_elem;
-	int ret;
 	size_t i;
 	for (i = 0; i < num_elem; ++i) {
 		elems[i].v = i;
@@ -48,7 +47,7 @@ int main(int argc, char *argv[])
 	ofi_log_function = logger;
 
 	nccl_ofi_deque_t *deque;
-	ret = nccl_ofi_deque_init(&deque);
+	int ret = nccl_ofi_deque_init(&deque);
 	if (ret) {
 		NCCL_OFI_WARN("deque_init failed: %d", ret);
 		exit(1);
@@ -72,7 +71,7 @@ int main(int argc, char *argv[])
 	for (i = 0; i < num_elem; ++i) {
 		int expected = (i == 0 ? elems[num_elem-1].v : elems[i-1].v);
 		ret = nccl_ofi_deque_remove_front(deque, &deque_elem);
-		if (ret || deque_elem == NULL) {
+		if (ret || deque_elem == nullptr) {
 			NCCL_OFI_WARN("remove_front unexpectedly failed: %d", ret);
 			exit(1);
 		}
@@ -83,7 +82,7 @@ int main(int argc, char *argv[])
 		}
 	}
 	ret = nccl_ofi_deque_remove_front(deque, &deque_elem);
-	if (ret != 0 || deque_elem != NULL) {
+	if (ret != 0 || deque_elem != nullptr) {
 		NCCL_OFI_WARN("remove_front from empty deque unexpectedly succeeded");
 		exit(1);
 	}
diff --git a/tests/unit/ep_addr_list.c b/tests/unit/ep_addr_list.cc
similarity index 99%
rename from tests/unit/ep_addr_list.c
rename to tests/unit/ep_addr_list.cc
index 7be5dd106..15d85d5ef 100644
--- a/tests/unit/ep_addr_list.c
+++ b/tests/unit/ep_addr_list.cc
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "test-common.h"
+#include "test-common.hpp"
 #include "nccl_ofi_ep_addr_list.h"
 
 static void insert_addresses(nccl_ofi_ep_addr_list_t *ep_addr_list, size_t num_addr, int ep_num)
diff --git a/tests/unit/freelist.c b/tests/unit/freelist.cc
similarity index 99%
rename from tests/unit/freelist.c
rename to tests/unit/freelist.cc
index 572d3f02c..2069f3211 100644
--- a/tests/unit/freelist.c
+++ b/tests/unit/freelist.cc
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "test-common.h"
+#include "test-common.hpp"
 #include "nccl_ofi_freelist.h"
 
 void *simple_base;
diff --git a/tests/unit/idpool.c b/tests/unit/idpool.cc
similarity index 99%
rename from tests/unit/idpool.c
rename to tests/unit/idpool.cc
index 770e98a2c..48076eeb3 100644
--- a/tests/unit/idpool.c
+++ b/tests/unit/idpool.cc
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "test-common.h"
+#include "test-common.hpp"
 #include "nccl_ofi_idpool.h"
 #include "nccl_ofi_math.h"
 
diff --git a/tests/unit/mr.c b/tests/unit/mr.cc
similarity index 99%
rename from tests/unit/mr.c
rename to tests/unit/mr.cc
index 365b570c7..3ae5f2ace 100644
--- a/tests/unit/mr.c
+++ b/tests/unit/mr.cc
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 
-#include "test-common.h"
+#include "test-common.hpp"
 #include "nccl_ofi_mr.h"
 
 bool test_lookup_impl(nccl_ofi_mr_cache_t *cache, void *addr, size_t size,
diff --git a/tests/unit/msgbuff.c b/tests/unit/msgbuff.cc
similarity index 99%
rename from tests/unit/msgbuff.c
rename to tests/unit/msgbuff.cc
index f697ec8ed..0571be812 100644
--- a/tests/unit/msgbuff.c
+++ b/tests/unit/msgbuff.cc
@@ -8,7 +8,7 @@
 
 #include "nccl_ofi_msgbuff.h"
 
-#include "test-common.h"
+#include "test-common.hpp"
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/unit/scheduler.c b/tests/unit/scheduler.cc
similarity index 99%
rename from tests/unit/scheduler.c
rename to tests/unit/scheduler.cc
index bfdfadd51..8d6f93a60 100644
--- a/tests/unit/scheduler.c
+++ b/tests/unit/scheduler.cc
@@ -11,7 +11,7 @@
 
 #include <nccl/net.h>
 
-#include "test-common.h"
+#include "test-common.hpp"
 #include "nccl_ofi_scheduler.h"
 
 int create_multiplexed(size_t size,
diff --git a/tests/unit/show_tuner_decisions.c b/tests/unit/show_tuner_decisions.cc
similarity index 100%
rename from tests/unit/show_tuner_decisions.c
rename to tests/unit/show_tuner_decisions.cc
diff --git a/tests/unit/test-common.h b/tests/unit/test-common.hpp
similarity index 80%
rename from tests/unit/test-common.h
rename to tests/unit/test-common.hpp
index 70b97e329..adb8762dd 100644
--- a/tests/unit/test-common.h
+++ b/tests/unit/test-common.hpp
@@ -5,14 +5,18 @@
 #ifndef TEST_COMMON_H_
 #define TEST_COMMON_H_
 
+#include "config.h"
+
 #include <stdarg.h>
 #include <stdio.h>
 
 #include "nccl_ofi.h"
 #include "nccl_ofi_log.h"
 
-static inline void logger(ncclDebugLogLevel level, unsigned long flags, const char *filefunc,
-			  int line, const char *fmt, ...)
+namespace {
+
+void logger(ncclDebugLogLevel level, unsigned long flags, const char *filefunc,
+			  int line, char const *const fmt, ...)
 {
 	va_list vargs;
 
@@ -24,7 +28,7 @@ static inline void logger(ncclDebugLogLevel level, unsigned long flags, const ch
 			printf("INFO: Function: %s Line: %d: ", filefunc, line);
 			break;
 		case NCCL_LOG_TRACE:
-#if OFI_NCCL_TRACE
+#if defined(OFI_NCCL_TRACE) && OFI_NCCL_TRACE
 			printf("TRACE: Function: %s Line: %d: ", filefunc, line);
 			break;
 #else
@@ -46,4 +50,6 @@ static inline void logger(ncclDebugLogLevel level, unsigned long flags, const ch
 #pragma GCC diagnostic pop
 }
 
+}
+
 #endif // End TEST_COMMON_H_