diff --git a/mavis/test/data/__init__.py b/mavis/test/data/__init__.py
index 9db24cd7b86..2468e3b3322 100644
--- a/mavis/test/data/__init__.py
+++ b/mavis/test/data/__init__.py
@@ -153,7 +153,7 @@ def create_file_from_template(
 
         if self.schools:
             for index, school in enumerate(self.schools):
-                static_replacements[f"<<SCHOOL_{index}_NAME>>"] = school.name
+                static_replacements[f"<<SCHOOL_{index}_NAME>>"] = f'"{school.name}"'
                 static_replacements[f"<<SCHOOL_{index}_URN>>"] = school.urn
 
         if self.nurse:
diff --git a/mavis/test/data/vaccs/i_systmone_hist_negative.csv b/mavis/test/data/vaccs/i_systmone_hist_negative.csv
index 66ca94f64d2..ca6093a174e 100644
--- a/mavis/test/data/vaccs/i_systmone_hist_negative.csv
+++ b/mavis/test/data/vaccs/i_systmone_hist_negative.csv
@@ -17,4 +17,4 @@ InvalidEventDate,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,123013325,,Cervarix 1,<<RAND
 FutureEventDate,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,123013325,,Cervarix 1,<<RANDOM_FNAME>>,LE3 2DA,Female,<<RANDOM_LNAME>>,20350219,School,<<VACCS_TIME>>,<<ORG_CODE>>,<<SCHOOL_0_NAME>>,<<SCHOOL_0_URN>>,
 PastEventDate,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,123013325,,Cervarix 1,<<RANDOM_FNAME>>,LE3 2DA,Female,<<RANDOM_LNAME>>,20050219,School,<<VACCS_TIME>>,<<ORG_CODE>>,<<SCHOOL_0_NAME>>,<<SCHOOL_0_URN>>,
 InvalidEventTime,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,123013325,,Cervarix 1,<<RANDOM_FNAME>>,LE3 2DA,Female,<<RANDOM_LNAME>>,<<HIST_VACCS_DATE>>,School,25:00:00,<<ORG_CODE>>,<<SCHOOL_0_NAME>>,<<SCHOOL_0_URN>>,
-InvalidSchoolURN,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,123013325,,Cervarix 1,<<RANDOM_FNAME>>,LE3 2DA,Female,<<RANDOM_LNAME>>,<<HIST_VACCS_DATE>>,School,<<VACCS_TIME>>,<<ORG_CODE>>,<<SCHOOL_0_NAME>>1,000000,
+InvalidSchoolURN,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,123013325,,Cervarix 1,<<RANDOM_FNAME>>,LE3 2DA,Female,<<RANDOM_LNAME>>,<<HIST_VACCS_DATE>>,School,<<VACCS_TIME>>,<<ORG_CODE>>,<<SCHOOL_0_NAME>>,000000,
diff --git a/mavis/test/data/vaccs/i_systmone_negative.csv b/mavis/test/data/vaccs/i_systmone_negative.csv
index 5c25b83b2ed..f2938bc518a 100644
--- a/mavis/test/data/vaccs/i_systmone_negative.csv
+++ b/mavis/test/data/vaccs/i_systmone_negative.csv
@@ -18,5 +18,5 @@ FutureEventDate,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,123013325,,Cervarix 1,<<RANDO
 PastEventDate,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,123013325,,Cervarix 1,<<RANDOM_FNAME>>,LE3 2DA,Female,<<RANDOM_LNAME>>,20050219,School,<<VACCS_TIME>>,<<ORG_CODE>>,<<SCHOOL_0_NAME>>,<<SCHOOL_0_URN>>,
 InvalidEventTime,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,123013325,,Cervarix 1,<<RANDOM_FNAME>>,LE3 2DA,Female,<<RANDOM_LNAME>>,<<VACCS_DATE>>,School,25:00:00,<<ORG_CODE>>,<<SCHOOL_0_NAME>>,<<SCHOOL_0_URN>>,
 FutureEventTime,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,123013325,,Cervarix 1,<<RANDOM_FNAME>>,LE3 2DA,Female,<<RANDOM_LNAME>>,<<VACCS_DATE>>,School,23:59:00,<<ORG_CODE>>,<<SCHOOL_0_NAME>>,<<SCHOOL_0_URN>>,
-InvalidSchoolURN,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,123013325,,Cervarix 1,<<RANDOM_FNAME>>,LE3 2DA,Female,<<RANDOM_LNAME>>,<<VACCS_DATE>>,School,<<VACCS_TIME>>,<<ORG_CODE>>,<<SCHOOL_0_NAME>>1,000000,
-LongBatchNumber,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901,,Cervarix 1,<<RANDOM_FNAME>>,LE3 2DA,Female,<<RANDOM_LNAME>>,<<VACCS_DATE>>,School,<<VACCS_TIME>>,<<ORG_CODE>>,<<SCHOOL_0_NAME>>1,000000,
+InvalidSchoolURN,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,123013325,,Cervarix 1,<<RANDOM_FNAME>>,LE3 2DA,Female,<<RANDOM_LNAME>>,<<VACCS_DATE>>,School,<<VACCS_TIME>>,<<ORG_CODE>>,<<SCHOOL_0_NAME>>,000000,
+LongBatchNumber,<<DOB_YEAR_10>>,<<RANDOM_NHS_NO>>,,12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901,,Cervarix 1,<<RANDOM_FNAME>>,LE3 2DA,Female,<<RANDOM_LNAME>>,<<VACCS_DATE>>,School,<<VACCS_TIME>>,<<ORG_CODE>>,<<SCHOOL_0_NAME>>,000000,