diff --git a/parser/parser_test.go b/parser/parser_test.go
index 502d03a2a..295b26ce8 100644
--- a/parser/parser_test.go
+++ b/parser/parser_test.go
@@ -203,8 +203,17 @@ func TestParser(t *testing.T) {
 			}
 
 			// If we get here with a todo test and -check-skipped is set, the test passes!
+			// Automatically remove the todo flag from metadata.json
 			if metadata.Todo && *checkSkipped {
-				t.Logf("PASSES NOW - can remove todo flag from: %s", entry.Name())
+				metadata.Todo = false
+				updatedBytes, err := json.Marshal(metadata)
+				if err != nil {
+					t.Errorf("Failed to marshal updated metadata: %v", err)
+				} else if err := os.WriteFile(metadataPath, append(updatedBytes, '\n'), 0644); err != nil {
+					t.Errorf("Failed to write updated metadata.json: %v", err)
+				} else {
+					t.Logf("ENABLED - removed todo flag from: %s", entry.Name())
+				}
 			}
 		})
 	}
diff --git a/parser/testdata/00978_table_function_values_alias/metadata.json b/parser/testdata/00978_table_function_values_alias/metadata.json
index ef120d978..0967ef424 100644
--- a/parser/testdata/00978_table_function_values_alias/metadata.json
+++ b/parser/testdata/00978_table_function_values_alias/metadata.json
@@ -1 +1 @@
-{"todo": true}
+{}
diff --git a/parser/testdata/01258_wrong_cast_filimonov/metadata.json b/parser/testdata/01258_wrong_cast_filimonov/metadata.json
index ef120d978..0967ef424 100644
--- a/parser/testdata/01258_wrong_cast_filimonov/metadata.json
+++ b/parser/testdata/01258_wrong_cast_filimonov/metadata.json
@@ -1 +1 @@
-{"todo": true}
+{}
diff --git a/parser/testdata/01352_generate_random_overflow/metadata.json b/parser/testdata/01352_generate_random_overflow/metadata.json
index ef120d978..0967ef424 100644
--- a/parser/testdata/01352_generate_random_overflow/metadata.json
+++ b/parser/testdata/01352_generate_random_overflow/metadata.json
@@ -1 +1 @@
-{"todo": true}
+{}
diff --git a/parser/testdata/02499_escaped_quote_schema_inference/metadata.json b/parser/testdata/02499_escaped_quote_schema_inference/metadata.json
index ef120d978..0967ef424 100644
--- a/parser/testdata/02499_escaped_quote_schema_inference/metadata.json
+++ b/parser/testdata/02499_escaped_quote_schema_inference/metadata.json
@@ -1 +1 @@
-{"todo": true}
+{}
diff --git a/parser/testdata/02502_bad_values_schema_inference/metadata.json b/parser/testdata/02502_bad_values_schema_inference/metadata.json
index ef120d978..0967ef424 100644
--- a/parser/testdata/02502_bad_values_schema_inference/metadata.json
+++ b/parser/testdata/02502_bad_values_schema_inference/metadata.json
@@ -1 +1 @@
-{"todo": true}
+{}
diff --git a/parser/testdata/02916_set_formatting/metadata.json b/parser/testdata/02916_set_formatting/metadata.json
index ef120d978..9e26dfeeb 100644
--- a/parser/testdata/02916_set_formatting/metadata.json
+++ b/parser/testdata/02916_set_formatting/metadata.json
@@ -1 +1 @@
-{"todo": true}
+{}
\ No newline at end of file