diff --git a/test/classes/phing/tasks/condition/PhingTaskTest.php b/test/classes/phing/tasks/condition/PhingTaskTest.php
index 935e921e2c..b481423921 100644
--- a/test/classes/phing/tasks/condition/PhingTaskTest.php
+++ b/test/classes/phing/tasks/condition/PhingTaskTest.php
@@ -294,4 +294,28 @@ public function testInheritPath(): void
     {
         $this->getProject()->executeTarget('testInheritPath');
     }
+
+    public function testUserPropertyWinsInheritAll(): void
+    {
+        $this->getProject()->setUserProperty("test", "7");
+        $this->getProject()->executeTarget("test-property-override-inheritall-start");
+        $this->assertInLogs('The value of test is 7');
+    }
+
+    public function testUserPropertyWinsNoInheritAll()
+    {
+        $this->getProject()->setUserProperty("test", "7");
+        $this->getProject()->executeTarget("test-property-override-no-inheritall-start");
+        $this->assertInLogs('The value of test is 7');
+    }
+
+    public function testOverrideWinsInheritAll()
+    {
+        $this->expectLogContaining('test-property-override-inheritall-start', 'The value of test is 4');
+    }
+
+    public function testOverrideWinsNoInheritAll()
+    {
+        $this->expectLogContaining('test-property-override-no-inheritall-start', 'The value of test is 4');
+    }
 }