diff --git a/unit-tests/sw-dev/test-metadata.py b/unit-tests/sw-dev/test-metadata.py
index 59ba3c622d8..792a2fedbeb 100644
--- a/unit-tests/sw-dev/test-metadata.py
+++ b/unit-tests/sw-dev/test-metadata.py
@@ -24,8 +24,14 @@ def frame_metadata_values():
         # Publish a frame
         f = sensor.publish( depth.frame() )
 
+        # Some metadata may be automatically added, even for software sensors
+        expected = set()
         for md in frame_metadata_values():
-            test.check_false( f.supports_frame_metadata( md ))
+            test.info( 'metadata', md )
+            if md in expected:
+                test.check( f.supports_frame_metadata( md ))
+            else:
+                test.check_false( f.supports_frame_metadata( md ))
 except:
     test.unexpected_exception()
 test.finish()
diff --git a/unit-tests/syncer/sw.py b/unit-tests/syncer/sw.py
index 845bb93e4d2..4ab4dc12875 100644
--- a/unit-tests/syncer/sw.py
+++ b/unit-tests/syncer/sw.py
@@ -203,6 +203,7 @@ def generate_depth_frame( frame_number, timestamp, next_expected=None ):
         depth_sensor.set_metadata( rs.frame_metadata_value.actual_fps, actual_fps )
         log.d( "-->", depth_frame, "with actual FPS", actual_fps )
     else:
+        depth_sensor.set_metadata( rs.frame_metadata_value.actual_fps, 0 )  # force to not use
         log.d( "-->", depth_frame )
     depth_sensor.on_video_frame( depth_frame )
 
@@ -228,6 +229,7 @@ def generate_color_frame( frame_number, timestamp, next_expected=None ):
         color_sensor.set_metadata( rs.frame_metadata_value.actual_fps, actual_fps )
         log.d( "-->", color_frame, "with actual FPS", actual_fps )
     else:
+        color_sensor.set_metadata( rs.frame_metadata_value.actual_fps, 0 )  # force to not use
         log.d( "-->", color_frame )
     color_sensor.on_video_frame( color_frame )