diff --git a/projects/packages/waf/changelog/fix-waf-tests b/projects/packages/waf/changelog/fix-waf-tests
new file mode 100644
index 000000000000..5647d6207860
--- /dev/null
+++ b/projects/packages/waf/changelog/fix-waf-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed the WAF package's PHP tests and Composer requirements
diff --git a/projects/packages/waf/composer.json b/projects/packages/waf/composer.json
index df53d6de4af2..1fa047ac8f99 100644
--- a/projects/packages/waf/composer.json
+++ b/projects/packages/waf/composer.json
@@ -4,6 +4,7 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
+		"automattic/jetpack-status": "@dev",
 		"wikimedia/aho-corasick": "^1.0"
 	},
 	"require-dev": {
diff --git a/projects/packages/waf/tests/php/test-waf-runtime-targets.php b/projects/packages/waf/tests/php/test-waf-runtime-targets.php
index 45f488108f46..8c53cdfee41c 100644
--- a/projects/packages/waf/tests/php/test-waf-runtime-targets.php
+++ b/projects/packages/waf/tests/php/test-waf-runtime-targets.php
@@ -450,24 +450,6 @@ public function testNormalizeRequestUri() {
 		);
 	}
 
-	/**
-	 * Test using REMOTE_ADDR target
-	 */
-	public function testNormalizeRemoteAddr() {
-		$request = $this->mock_request( array( 'remote_addr' => 'test_remote_addr' ) );
-		$runtime = new Waf_Runtime( new Waf_Transforms(), new Waf_Operators(), $request );
-		$values  = $runtime->normalize_targets( array( 'remote_addr' => array() ) );
-		$this->assertCount( 1, $values );
-		$this->assertContains(
-			array(
-				'name'   => 'remote_addr',
-				'value'  => 'test_remote_addr',
-				'source' => 'remote_addr',
-			),
-			$values
-		);
-	}
-
 	/**
 	 * Test using REQUEST_BODY target
 	 */
diff --git a/projects/plugins/jetpack/changelog/fix-waf-tests b/projects/plugins/jetpack/changelog/fix-waf-tests
new file mode 100644
index 000000000000..c066912682ac
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-waf-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Updated composer.lock
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
index 1ddc62b7db0f..0f23678dce74 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/composer.lock
@@ -2271,9 +2271,10 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/waf",
-                "reference": "1d5c7fe2ae0c66b80181f4f4aa55288ce157e421"
+                "reference": "086d92553c659877fb31988a7119b48843d518a7"
             },
             "require": {
+                "automattic/jetpack-status": "@dev",
                 "wikimedia/aho-corasick": "^1.0"
             },
             "require-dev": {
diff --git a/projects/plugins/protect/changelog/fix-waf-tests b/projects/plugins/protect/changelog/fix-waf-tests
new file mode 100644
index 000000000000..92f9e0f25f89
--- /dev/null
+++ b/projects/plugins/protect/changelog/fix-waf-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Updated composer.lock
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
index ad601606945f..197f76433214 100644
--- a/projects/plugins/protect/composer.lock
+++ b/projects/plugins/protect/composer.lock
@@ -1348,9 +1348,10 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/waf",
-                "reference": "1d5c7fe2ae0c66b80181f4f4aa55288ce157e421"
+                "reference": "086d92553c659877fb31988a7119b48843d518a7"
             },
             "require": {
+                "automattic/jetpack-status": "@dev",
                 "wikimedia/aho-corasick": "^1.0"
             },
             "require-dev": {