diff --git a/test/shell/system_id.sh b/test/shell/system_id.sh
index feb66ae61..71e6ee937 100644
--- a/test/shell/system_id.sh
+++ b/test/shell/system_id.sh
@@ -13,9 +13,6 @@ test_description='Test system_id'
 
 . lib/inittest
 
-# FIXME: vgs --foreign is not seeing foreign vg when lvmetad is not used
-test -e LOCAL_LVMETAD || skip
-
 aux prepare_devs 1
 
 # create vg with system_id using each source
diff --git a/tools/reporter.c b/tools/reporter.c
index ef74dc481..cd0db6fa2 100644
--- a/tools/reporter.c
+++ b/tools/reporter.c
@@ -587,10 +587,9 @@ static int _report(struct cmd_context *cmd, int argc, char **argv,
 	 * to their own VGs.  We also want to override the default
 	 * behavior which skips over foreign VGs.
 	 */
-	if (arg_is_set(cmd, foreign_ARG) && lvmetad_used()) {
+	cmd->include_foreign_vgs = arg_is_set(cmd, foreign_ARG);
+	if (cmd->include_foreign_vgs && lvmetad_used())
 		lvmetad_pvscan_all_devs(cmd, NULL);
-		cmd->include_foreign_vgs = 1;
-	}
 
 	aligned = find_config_tree_bool(cmd, report_aligned_CFG, NULL);
 	buffered = find_config_tree_bool(cmd, report_buffered_CFG, NULL);