diff --git a/app/assets/templates/aspects-dropdown.handlebars b/app/assets/templates/aspects-dropdown.jst.hbs
similarity index 100%
rename from app/assets/templates/aspects-dropdown.handlebars
rename to app/assets/templates/aspects-dropdown.jst.hbs
diff --git a/app/assets/templates/day.handlebars b/app/assets/templates/day.jst.hbs
similarity index 100%
rename from app/assets/templates/day.handlebars
rename to app/assets/templates/day.jst.hbs
diff --git a/app/assets/templates/framer.handlebars b/app/assets/templates/framer.jst.hbs
similarity index 100%
rename from app/assets/templates/framer.handlebars
rename to app/assets/templates/framer.jst.hbs
diff --git a/app/assets/templates/photo-viewer.handlebars b/app/assets/templates/photo-viewer.jst.hbs
similarity index 100%
rename from app/assets/templates/photo-viewer.handlebars
rename to app/assets/templates/photo-viewer.jst.hbs
diff --git a/app/assets/templates/picture-form.handlebars b/app/assets/templates/picture-form.jst.hbs
similarity index 100%
rename from app/assets/templates/picture-form.handlebars
rename to app/assets/templates/picture-form.jst.hbs
diff --git a/app/assets/templates/post-form.handlebars b/app/assets/templates/post-form.jst.hbs
similarity index 100%
rename from app/assets/templates/post-form.handlebars
rename to app/assets/templates/post-form.jst.hbs
diff --git a/app/assets/templates/post-new.handlebars b/app/assets/templates/post-new.jst.hbs
similarity index 100%
rename from app/assets/templates/post-new.handlebars
rename to app/assets/templates/post-new.jst.hbs
diff --git a/app/assets/templates/services-selector.handlebars b/app/assets/templates/services-selector.jst.hbs
similarity index 100%
rename from app/assets/templates/services-selector.handlebars
rename to app/assets/templates/services-selector.jst.hbs
diff --git a/app/assets/templates/template-picker.handlebars b/app/assets/templates/template-picker.jst.hbs
similarity index 100%
rename from app/assets/templates/template-picker.handlebars
rename to app/assets/templates/template-picker.jst.hbs
diff --git a/spec/javascripts/helpers/SpecHelper.js b/spec/javascripts/helpers/SpecHelper.js
index fa6768acf..67b513933 100644
--- a/spec/javascripts/helpers/SpecHelper.js
+++ b/spec/javascripts/helpers/SpecHelper.js
@@ -33,6 +33,7 @@ beforeEach(function() {
 
 afterEach(function() {
   //spec.clearLiveEventBindings();
+  $("#jasmine_content").empty()
   expect(spec.loadFixtureCount).toBeLessThan(2);
   spec.loadFixtureCount = 0;
 });