diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e2c43191..febccd0c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -156,27 +156,27 @@ jobs:
           aws-region: us-west-2
 
       - name: Build the servers
-        run: cd test-server && make build-all-servers FILTER=ruby,go,cpp
+        run: cd test-server && make build-all-servers FILTER=ruby,go,cpp,php
         env:
           MAKEFLAGS: -j${{ steps.cpu-count.outputs.count }}
           AWS_REGION: us-west-2
 
       - name: Start the servers
-        run: cd test-server && make start-all-servers FILTER=ruby,go,cpp
+        run: cd test-server && make start-all-servers FILTER=ruby,go,cpp,php
         env:
           AWS_REGION: us-west-2
           TEST_SERVER_S3_BUCKET: ${{ vars.TEST_SERVER_S3_BUCKET }}
           TEST_SERVER_KMS_KEY_ARN: ${{ vars.TEST_SERVER_KMS_KEY_ARN }}
 
       - name: Wait for servers to start
-        run: cd test-server && make wait-all-servers FILTER=ruby,go,cpp
+        run: cd test-server && make wait-all-servers FILTER=ruby,go,cpp,php
         env:
           AWS_REGION: us-west-2
           TEST_SERVER_S3_BUCKET: ${{ vars.TEST_SERVER_S3_BUCKET }}
           TEST_SERVER_KMS_KEY_ARN: ${{ vars.TEST_SERVER_KMS_KEY_ARN }}
 
       - name: Run run-tests
-        run: cd test-server && make run-tests FILTER=ruby,go,cpp
+        run: cd test-server && make run-tests FILTER=ruby,go,cpp,php
         env:
           AWS_REGION: us-west-2
           TEST_SERVER_S3_BUCKET: ${{ vars.TEST_SERVER_S3_BUCKET }}
@@ -194,7 +194,7 @@ jobs:
             test-server/*/net-v3-server.log
 
       - name: Stop the servers
-        run: cd test-server && make stop-servers FILTER=ruby,go,cpp
+        run: cd test-server && make stop-servers FILTER=ruby,go,cpp,php
 
       - name: Upload results
         if: always()
diff --git a/.gitmodules b/.gitmodules
index 51e8e255..1e395ed8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,10 +28,6 @@
 	path = test-server/specification
 	url = git@github.com:awslabs/private-aws-encryption-sdk-specification-staging.git
 	branch = fire-egg-staging
-[submodule "test-server/php-v2-transition-server/local-php-sdk"]
-	path = test-server/php-v2-transition-server/local-php-sdk
-	url = git@github.com:aws/private-aws-sdk-php-staging.git
-	branch = s3ec/transitional
 [submodule "test-server/net-v2-v3-server/s3ec-net-v2"]
 	path = test-server/net-v2-v3-server/s3ec-net-v2
 	url = https://github.com/aws/private-amazon-s3-encryption-client-dotnet-staging.git
diff --git a/test-server/php-v2-transition-server/local-php-sdk b/test-server/php-v2-transition-server/local-php-sdk
deleted file mode 160000
index 8e22105d..00000000
--- a/test-server/php-v2-transition-server/local-php-sdk
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8e22105d4e10d3410a0d3390b18bad74fe21be00
diff --git a/test-server/php-v2-transition-server/local-php-sdk b/test-server/php-v2-transition-server/local-php-sdk
new file mode 120000
index 00000000..4610ddb9
--- /dev/null
+++ b/test-server/php-v2-transition-server/local-php-sdk
@@ -0,0 +1 @@
+../php-v3-server/local-php-sdk
\ No newline at end of file
diff --git a/test-server/php-v2-transition-server/local-php-sdk~fireegg-test-servers b/test-server/php-v2-transition-server/local-php-sdk~fireegg-test-servers
deleted file mode 120000
index 4610ddb9..00000000
--- a/test-server/php-v2-transition-server/local-php-sdk~fireegg-test-servers
+++ /dev/null
@@ -1 +0,0 @@
-../php-v3-server/local-php-sdk
\ No newline at end of file
diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index 8e22105d..c81d43cd 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit 8e22105d4e10d3410a0d3390b18bad74fe21be00
+Subproject commit c81d43cd86764642ed83b1457f0f3ae87b052d23