diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php
index 38e4246bde19e22a71bbfa63810cb9ea8c33b76d..7601e7472798bbd96252f66eb7ce8061b3b65366 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php
@@ -58,7 +58,13 @@ class Test_Piwik_Integration_TwoVisitsWithCustomVariables_SegmentMatchNONE exten
             if ($segment['segment'] == 'visitEcommerceStatus') {
                 $value = 'none';
             }
-            $segmentExpression[] = $segment['segment'] . '!=' . $value;
+            $matchNone = $segment['segment'] . '!=' . $value;
+
+            // deviceType != campaign matches ALL visits, but we want to match None
+            if($segment['segment'] == 'deviceType') {
+                $matchNone = $segment['segment'] . '==car%20browser';
+            }
+            $segmentExpression[] = $matchNone;
         }
 
         $segment = implode(";", $segmentExpression);