diff --git a/spec/_files/apostrophe.html b/spec/_files/apostrophe.mustache
similarity index 100%
rename from spec/_files/apostrophe.html
rename to spec/_files/apostrophe.mustache
diff --git a/spec/_files/array_of_partials_implicit_partial.2.html b/spec/_files/array_of_partials_implicit_partial.2.mustache
similarity index 100%
rename from spec/_files/array_of_partials_implicit_partial.2.html
rename to spec/_files/array_of_partials_implicit_partial.2.mustache
diff --git a/spec/_files/array_of_partials_implicit_partial.html b/spec/_files/array_of_partials_implicit_partial.mustache
similarity index 100%
rename from spec/_files/array_of_partials_implicit_partial.html
rename to spec/_files/array_of_partials_implicit_partial.mustache
diff --git a/spec/_files/array_of_partials_partial.2.html b/spec/_files/array_of_partials_partial.2.mustache
similarity index 100%
rename from spec/_files/array_of_partials_partial.2.html
rename to spec/_files/array_of_partials_partial.2.mustache
diff --git a/spec/_files/array_of_partials_partial.html b/spec/_files/array_of_partials_partial.mustache
similarity index 100%
rename from spec/_files/array_of_partials_partial.html
rename to spec/_files/array_of_partials_partial.mustache
diff --git a/spec/_files/array_of_strings.html b/spec/_files/array_of_strings.mustache
similarity index 100%
rename from spec/_files/array_of_strings.html
rename to spec/_files/array_of_strings.mustache
diff --git a/spec/_files/array_of_strings_options.html b/spec/_files/array_of_strings_options.mustache
similarity index 100%
rename from spec/_files/array_of_strings_options.html
rename to spec/_files/array_of_strings_options.mustache
diff --git a/spec/_files/array_partial.2.html b/spec/_files/array_partial.2.mustache
similarity index 100%
rename from spec/_files/array_partial.2.html
rename to spec/_files/array_partial.2.mustache
diff --git a/spec/_files/array_partial.html b/spec/_files/array_partial.mustache
similarity index 100%
rename from spec/_files/array_partial.html
rename to spec/_files/array_partial.mustache
diff --git a/spec/_files/bug_11_eating_whitespace.html b/spec/_files/bug_11_eating_whitespace.mustache
similarity index 100%
rename from spec/_files/bug_11_eating_whitespace.html
rename to spec/_files/bug_11_eating_whitespace.mustache
diff --git a/spec/_files/comments.html b/spec/_files/comments.mustache
similarity index 100%
rename from spec/_files/comments.html
rename to spec/_files/comments.mustache
diff --git a/spec/_files/complex.html b/spec/_files/complex.mustache
similarity index 100%
rename from spec/_files/complex.html
rename to spec/_files/complex.mustache
diff --git a/spec/_files/delimiters.html b/spec/_files/delimiters.mustache
similarity index 100%
rename from spec/_files/delimiters.html
rename to spec/_files/delimiters.mustache
diff --git a/spec/_files/dot_notation.html b/spec/_files/dot_notation.mustache
similarity index 100%
rename from spec/_files/dot_notation.html
rename to spec/_files/dot_notation.mustache
diff --git a/spec/_files/double_render.html b/spec/_files/double_render.mustache
similarity index 100%
rename from spec/_files/double_render.html
rename to spec/_files/double_render.mustache
diff --git a/spec/_files/empty_partial.2.html b/spec/_files/empty_partial.2.mustache
similarity index 100%
rename from spec/_files/empty_partial.2.html
rename to spec/_files/empty_partial.2.mustache
diff --git a/spec/_files/empty_partial.html b/spec/_files/empty_partial.mustache
similarity index 100%
rename from spec/_files/empty_partial.html
rename to spec/_files/empty_partial.mustache
diff --git a/spec/_files/empty_sections.html b/spec/_files/empty_sections.mustache
similarity index 100%
rename from spec/_files/empty_sections.html
rename to spec/_files/empty_sections.mustache
diff --git a/spec/_files/empty_template.html b/spec/_files/empty_template.mustache
similarity index 100%
rename from spec/_files/empty_template.html
rename to spec/_files/empty_template.mustache
diff --git a/spec/_files/error_not_found.html b/spec/_files/error_not_found.mustache
similarity index 100%
rename from spec/_files/error_not_found.html
rename to spec/_files/error_not_found.mustache
diff --git a/spec/_files/escaped.html b/spec/_files/escaped.mustache
similarity index 100%
rename from spec/_files/escaped.html
rename to spec/_files/escaped.mustache
diff --git a/spec/_files/higher_order_sections.html b/spec/_files/higher_order_sections.mustache
similarity index 100%
rename from spec/_files/higher_order_sections.html
rename to spec/_files/higher_order_sections.mustache
diff --git a/spec/_files/inverted_section.html b/spec/_files/inverted_section.mustache
similarity index 100%
rename from spec/_files/inverted_section.html
rename to spec/_files/inverted_section.mustache
diff --git a/spec/_files/keys_with_questionmarks.html b/spec/_files/keys_with_questionmarks.mustache
similarity index 100%
rename from spec/_files/keys_with_questionmarks.html
rename to spec/_files/keys_with_questionmarks.mustache
diff --git a/spec/_files/nesting.html b/spec/_files/nesting.mustache
similarity index 100%
rename from spec/_files/nesting.html
rename to spec/_files/nesting.mustache
diff --git a/spec/_files/null_string.html b/spec/_files/null_string.mustache
similarity index 100%
rename from spec/_files/null_string.html
rename to spec/_files/null_string.mustache
diff --git a/spec/_files/partial_recursion.2.html b/spec/_files/partial_recursion.2.mustache
similarity index 100%
rename from spec/_files/partial_recursion.2.html
rename to spec/_files/partial_recursion.2.mustache
diff --git a/spec/_files/partial_recursion.html b/spec/_files/partial_recursion.mustache
similarity index 100%
rename from spec/_files/partial_recursion.html
rename to spec/_files/partial_recursion.mustache
diff --git a/spec/_files/recursion_with_same_names.html b/spec/_files/recursion_with_same_names.mustache
similarity index 100%
rename from spec/_files/recursion_with_same_names.html
rename to spec/_files/recursion_with_same_names.mustache
diff --git a/spec/_files/reuse_of_enumerables.html b/spec/_files/reuse_of_enumerables.mustache
similarity index 100%
rename from spec/_files/reuse_of_enumerables.html
rename to spec/_files/reuse_of_enumerables.mustache
diff --git a/spec/_files/section_as_context.html b/spec/_files/section_as_context.mustache
similarity index 100%
rename from spec/_files/section_as_context.html
rename to spec/_files/section_as_context.mustache
diff --git a/spec/_files/simple.html b/spec/_files/simple.mustache
similarity index 100%
rename from spec/_files/simple.html
rename to spec/_files/simple.mustache
diff --git a/spec/_files/template_partial.2.html b/spec/_files/template_partial.2.mustache
similarity index 100%
rename from spec/_files/template_partial.2.html
rename to spec/_files/template_partial.2.mustache
diff --git a/spec/_files/template_partial.html b/spec/_files/template_partial.mustache
similarity index 100%
rename from spec/_files/template_partial.html
rename to spec/_files/template_partial.mustache
diff --git a/spec/_files/two_in_a_row.html b/spec/_files/two_in_a_row.mustache
similarity index 100%
rename from spec/_files/two_in_a_row.html
rename to spec/_files/two_in_a_row.mustache
diff --git a/spec/_files/two_sections.html b/spec/_files/two_sections.mustache
similarity index 100%
rename from spec/_files/two_sections.html
rename to spec/_files/two_sections.mustache
diff --git a/spec/_files/unescaped.html b/spec/_files/unescaped.mustache
similarity index 100%
rename from spec/_files/unescaped.html
rename to spec/_files/unescaped.mustache
diff --git a/spec/_files/unknown_pragma.html b/spec/_files/unknown_pragma.mustache
similarity index 100%
rename from spec/_files/unknown_pragma.html
rename to spec/_files/unknown_pragma.mustache
diff --git a/spec/_files/view_partial.2.html b/spec/_files/view_partial.2.mustache
similarity index 100%
rename from spec/_files/view_partial.2.html
rename to spec/_files/view_partial.2.mustache
diff --git a/spec/_files/view_partial.html b/spec/_files/view_partial.mustache
similarity index 100%
rename from spec/_files/view_partial.html
rename to spec/_files/view_partial.mustache
diff --git a/spec/_files/whitespace_partial.2.html b/spec/_files/whitespace_partial.2.mustache
similarity index 100%
rename from spec/_files/whitespace_partial.2.html
rename to spec/_files/whitespace_partial.2.mustache
diff --git a/spec/_files/whitespace_partial.html b/spec/_files/whitespace_partial.mustache
similarity index 100%
rename from spec/_files/whitespace_partial.html
rename to spec/_files/whitespace_partial.mustache
diff --git a/spec/mustache_spec.rb b/spec/mustache_spec.rb
index 7edc071..e04bec1 100644
--- a/spec/mustache_spec.rb
+++ b/spec/mustache_spec.rb
@@ -21,13 +21,13 @@ RHINO_JAR = "org.mozilla.javascript.tools.shell.Main"
 
 def load_test(name, is_partial=false)
   view = File.read(File.join(FILES, "#{name}.js"))
-  template = File.read(File.join(FILES, "#{name}.html")).to_json
+  template = File.read(File.join(FILES, "#{name}.mustache")).to_json
   expect = File.read(File.join(FILES, "#{name}.txt"))
 
   test = [view, template, expect]
 
   if is_partial
-    test << File.read(File.join(FILES, "#{name}.2.html")).to_json
+    test << File.read(File.join(FILES, "#{name}.2.mustache")).to_json
   end
 
   test
@@ -238,7 +238,7 @@ describe "mustache" do
     end
   end
 
-  context "running in Rhino (Mozilla)" do
+  context "running in Rhino (Mozilla, Java)" do
     if `java #{RHINO_JAR} 'foo' 2>&1` !~ /ClassNotFoundException/
       before(:all) do
         $stdout.write "Testing in Rhino "