diff --git a/test-server/Makefile b/test-server/Makefile
index cd667505..a166030a 100644
--- a/test-server/Makefile
+++ b/test-server/Makefile
@@ -9,7 +9,6 @@ all: start-all-servers run-tests
 ci: start-all-servers run-tests stop-servers
 
 SERVER_DIRS := $(shell find . -maxdepth 1 -type d -name '*-server' | sed 's|^\./||' | $(if $(FILTER),grep -E "$$(echo '$(FILTER)' | sed 's/,/|/g')",cat) | sort)
-# SERVER_DIRS := cpp-v3-server
 
 START_SERVER_TARGETS := $(addprefix start-, $(SERVER_DIRS))
 WAIT_SERVER_TARGETS := $(addprefix wait-, $(SERVER_DIRS))
@@ -125,4 +124,4 @@ duvet:
 	@for dir in $(SERVER_DIRS); do \
 		echo "Running make duvet in $$dir..."; \
 		$(MAKE) -C $$dir duvet; \
-	done
\ No newline at end of file
+	done
diff --git a/test-server/cpp-v2-server/Makefile b/test-server/cpp-v2-server/Makefile
index 9399b631..cc562c1a 100644
--- a/test-server/cpp-v2-server/Makefile
+++ b/test-server/cpp-v2-server/Makefile
@@ -6,20 +6,20 @@ PID_FILE := server.pid
 PORT := 8085
 
 build/s3ec-server: 
-# 	brew install libmicrohttpd nlohmann-json ossp-uuid
-# 	git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp.git
-# 	cd aws-sdk-cpp
-# 	mkdir -p build && cd build && cmake ..
+	brew install libmicrohttpd nlohmann-json ossp-uuid
+	git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp.git
+	cd aws-sdk-cpp
+	mkdir -p build && cd build && cmake ..
 
 start-server: | build/s3ec-server
-# 	@echo "Starting Cpp V2 server..."
-# 	cd build && make && \
-# 	AWS_ACCESS_KEY_ID="$$AWS_ACCESS_KEY_ID" \
-# 	AWS_SECRET_ACCESS_KEY="$$AWS_SECRET_ACCESS_KEY" \
-# 	AWS_SESSION_TOKEN="$$AWS_SESSION_TOKEN" \
-# 	AWS_REGION="us-west-2" \
-# 	./s3ec-server & echo $$! > $(PID_FILE)
-# 	@echo "Cpp V2 server starting..."
+	@echo "Starting Cpp V2 server..."
+	cd build && make && \
+	AWS_ACCESS_KEY_ID="$$AWS_ACCESS_KEY_ID" \
+	AWS_SECRET_ACCESS_KEY="$$AWS_SECRET_ACCESS_KEY" \
+	AWS_SESSION_TOKEN="$$AWS_SESSION_TOKEN" \
+	AWS_REGION="us-west-2" \
+	./s3ec-server & echo $$! > $(PID_FILE)
+	@echo "Cpp V2 server starting..."
 
 stop-server:
 	@if [ -f $(PID_FILE) ]; then \
diff --git a/test-server/cpp-v2-server/main.cpp b/test-server/cpp-v2-server/main.cpp
index c89ea8c3..c4f2c240 100644
--- a/test-server/cpp-v2-server/main.cpp
+++ b/test-server/cpp-v2-server/main.cpp
@@ -61,7 +61,7 @@ MHD_Result handle_create_client(struct MHD_Connection *connection,
     auto materials =
         std::make_shared<KMSWithContextEncryptionMaterials>(kms_key_id);
     CryptoConfigurationV2 config(materials);
-    if (legacy1 || legacy2) {
+    if (legacy1 || legacy2)
       config.SetSecurityProfile(SecurityProfile::V2_AND_LEGACY);
 
     auto encryption_client = std::make_shared<S3EncryptionClientV2>(config);
diff --git a/test-server/cpp-v2-transition-server/Makefile b/test-server/cpp-v2-transition-server/Makefile
index b879358d..0a63b2ed 100644
--- a/test-server/cpp-v2-transition-server/Makefile
+++ b/test-server/cpp-v2-transition-server/Makefile
@@ -6,18 +6,18 @@ PID_FILE := server.pid
 PORT := 8097
 
 build/s3ec-server: 
-# 	brew install libmicrohttpd nlohmann-json ossp-uuid
-# 	mkdir -p build && cd build && cmake ..
+	brew install libmicrohttpd nlohmann-json ossp-uuid
+	mkdir -p build && cd build && cmake ..
 
 start-server: | build/s3ec-server
-# 	@echo "Starting Cpp V2 server..."
-# 	cd build && make && \
-# 	AWS_ACCESS_KEY_ID="$$AWS_ACCESS_KEY_ID" \
-# 	AWS_SECRET_ACCESS_KEY="$$AWS_SECRET_ACCESS_KEY" \
-# 	AWS_SESSION_TOKEN="$$AWS_SESSION_TOKEN" \
-# 	AWS_REGION="us-west-2" \
-# 	./s3ec-server & echo $$! > $(PID_FILE)
-# 	@echo "Cpp V2 server starting..."
+	@echo "Starting Cpp V2 server..."
+	cd build && make && \
+	AWS_ACCESS_KEY_ID="$$AWS_ACCESS_KEY_ID" \
+	AWS_SECRET_ACCESS_KEY="$$AWS_SECRET_ACCESS_KEY" \
+	AWS_SESSION_TOKEN="$$AWS_SESSION_TOKEN" \
+	AWS_REGION="us-west-2" \
+	./s3ec-server & echo $$! > $(PID_FILE)
+	@echo "Cpp V2 server starting..."
 
 stop-server:
 	@if [ -f $(PID_FILE) ]; then \
@@ -26,7 +26,7 @@ stop-server:
 	fi
 
 wait-for-server:
-# 	$(MAKE) -C .. wait-for-port PORT=$(PORT)
+	$(MAKE) -C .. wait-for-port PORT=$(PORT)
 
 duvet:
 	duvet report
diff --git a/test-server/cpp-v2-transition-server/main.cpp b/test-server/cpp-v2-transition-server/main.cpp
index 4dd505bf..e8ce8e5c 100644
--- a/test-server/cpp-v2-transition-server/main.cpp
+++ b/test-server/cpp-v2-transition-server/main.cpp
@@ -61,7 +61,7 @@ MHD_Result handle_create_client(struct MHD_Connection *connection,
     auto materials =
         std::make_shared<KMSWithContextEncryptionMaterials>(kms_key_id);
     CryptoConfigurationV2 config(materials);
-    if (legacy1 || legacy2) {
+    if (legacy1 || legacy2)
       config.SetSecurityProfile(SecurityProfile::V2_AND_LEGACY);
 
     auto encryption_client = std::make_shared<S3EncryptionClientV2>(config);
diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
index 78cb6eb2..a6af0872 100644
--- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
+++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
@@ -102,7 +102,7 @@ public class TestUtils {
             JAVA_V3_CURRENT,
             GO_V3_CURRENT,
             NET_V2_CURRENT,
-            // CPP_V2_CURRENT,
+            CPP_V2_CURRENT,
             RUBY_V2_CURRENT,
             PHP_V2_CURRENT
         );
@@ -112,7 +112,7 @@ public class TestUtils {
             // JAVA_V3_TRANSITION,
             // GO_V3_TRANSITION,
             // NET_V2_TRANSITION,
-            // CPP_V2_TRANSITION,
+            CPP_V2_TRANSITION,
             // PHP_V2_TRANSITION,
             RUBY_V2_TRANSITION
         );
@@ -137,7 +137,7 @@ public class TestUtils {
         servers.put(GO_V3_CURRENT, new LanguageServerTarget(GO_V3_CURRENT, "8082"));
         servers.put(NET_V2_CURRENT, new LanguageServerTarget(NET_V2_CURRENT, "8083"));
         servers.put(NET_V3, new LanguageServerTarget(NET_V3, "8084"));
-        // servers.put(CPP_V2_CURRENT, new LanguageServerTarget(CPP_V2_CURRENT, "8085"));
+        servers.put(CPP_V2_CURRENT, new LanguageServerTarget(CPP_V2_CURRENT, "8085"));
         // servers.put(RUBY_V2_CURRENT, new LanguageServerTarget(RUBY_V2_CURRENT, "8086"));
         servers.put(PHP_V2_CURRENT, new LanguageServerTarget(PHP_V2_CURRENT, "8087"));
         servers.put(GO_V4, new LanguageServerTarget(GO_V4, "8089"));
@@ -147,7 +147,7 @@ public class TestUtils {
         servers.put(JAVA_V3_TRANSITION, new LanguageServerTarget(JAVA_V3_TRANSITION, "8094"));
         // servers.put(GO_V3_TRANSITION, new LanguageServerTarget(GO_V3_TRANSITION, "8095"));
         // servers.put(NET_V2_TRANSITION, new LanguageServerTarget(NET_V2_TRANSITION, "8096"));
-        // servers.put(CPP_V2_TRANSITION, new LanguageServerTarget(CPP_V2_TRANSITION, "8097"));
+        servers.put(CPP_V2_TRANSITION, new LanguageServerTarget(CPP_V2_TRANSITION, "8097"));
         servers.put(RUBY_V2_TRANSITION, new LanguageServerTarget(RUBY_V2_TRANSITION, "8098"));
         servers.put(PHP_V2_TRANSITION, new LanguageServerTarget(PHP_V2_TRANSITION, "8099"));
         servers.put(JAVA_V4, new LanguageServerTarget(JAVA_V4, "8090"));