diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51530e6..6c170a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ### next
 
+* Moved the schema file validation into the retry block for parallel execution
+  (#36)
 * Updated the [Kafka Playground](./doc/kafka-playground) to the latest
   Apache Kafka (3.7) and Schema Registry (7.6) versions (#35)
 
diff --git a/lib/rimless/avro_utils.rb b/lib/rimless/avro_utils.rb
index 6166213..5c9f630 100644
--- a/lib/rimless/avro_utils.rb
+++ b/lib/rimless/avro_utils.rb
@@ -41,10 +41,9 @@ def render_file(src)
         FileUtils.mkdir_p(File.dirname(dest))
         # Write the rendered file contents to the destination
         File.write(dest, ERB.new(File.read(src)).result(binding))
+        # Check the written file for correct JSON
+        validate_file(dest)
       end
-
-      # Check the written file for correct JSON
-      validate_file(dest)
     end
 
     # Check the given file for valid JSON.