diff --git a/README.md b/README.md
index 676b2a65f..748a90d80 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@ CodeCombat
 ==========
 
 ![](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/readme_00.png)
+[![Build Status](https://travis-ci.org/codecombat/codecombat.png?branch=master)](https://travis-ci.org/codecombat/codecombat)
 
 CodeCombat is a multiplayer programming game for learning how to code. **See the [Archmage developer wiki](https://github.com/codecombat/codecombat/wiki) for a dev setup guide, extensive documentation, and much more.**
 
diff --git a/test/app/lib/forms.coffee b/test/app/lib/forms.spec.coffee
similarity index 100%
rename from test/app/lib/forms.coffee
rename to test/app/lib/forms.spec.coffee
diff --git a/test/app/lib/goal_manager.coffee b/test/app/lib/goal_manager.spec.coffee
similarity index 100%
rename from test/app/lib/goal_manager.coffee
rename to test/app/lib/goal_manager.spec.coffee
diff --git a/test/app/lib/path.coffee b/test/app/lib/path.spec.coffee
similarity index 100%
rename from test/app/lib/path.coffee
rename to test/app/lib/path.spec.coffee
diff --git a/test/app/lib/router.coffee b/test/app/lib/router.spec.coffee
similarity index 100%
rename from test/app/lib/router.coffee
rename to test/app/lib/router.spec.coffee
diff --git a/test/app/lib/script_manager.coffee b/test/app/lib/script_manager.spec.coffee
similarity index 100%
rename from test/app/lib/script_manager.coffee
rename to test/app/lib/script_manager.spec.coffee
diff --git a/test/app/lib/surface/camera.coffee b/test/app/lib/surface/camera.spec.coffee
similarity index 100%
rename from test/app/lib/surface/camera.coffee
rename to test/app/lib/surface/camera.spec.coffee
diff --git a/test/app/lib/world/goal_manager.coffee b/test/app/lib/world/goal_manager.spec.coffee
similarity index 100%
rename from test/app/lib/world/goal_manager.coffee
rename to test/app/lib/world/goal_manager.spec.coffee
diff --git a/test/app/lib/world/rectangle.coffee b/test/app/lib/world/rectangle.spec.coffee
similarity index 100%
rename from test/app/lib/world/rectangle.coffee
rename to test/app/lib/world/rectangle.spec.coffee
diff --git a/test/app/lib/world/thang.coffee b/test/app/lib/world/thang.spec.coffee
similarity index 100%
rename from test/app/lib/world/thang.coffee
rename to test/app/lib/world/thang.spec.coffee
diff --git a/test/app/lib/world/vector.coffee b/test/app/lib/world/vector.spec.coffee
similarity index 100%
rename from test/app/lib/world/vector.coffee
rename to test/app/lib/world/vector.spec.coffee
diff --git a/test/app/lib/world/world.coffee b/test/app/lib/world/world.spec.coffee
similarity index 100%
rename from test/app/lib/world/world.coffee
rename to test/app/lib/world/world.spec.coffee
diff --git a/test/app/views/editor/components_tab_view.coffee b/test/app/views/editor/components_tab_view.spec.coffee
similarity index 100%
rename from test/app/views/editor/components_tab_view.coffee
rename to test/app/views/editor/components_tab_view.spec.coffee
diff --git a/test/app/views/editor/editor_view.coffee b/test/app/views/editor/editor_view.spec.coffee
similarity index 100%
rename from test/app/views/editor/editor_view.coffee
rename to test/app/views/editor/editor_view.spec.coffee
diff --git a/test/app/views/editor/scripts_tab_view.coffee b/test/app/views/editor/scripts_tab_view.spec.coffee
similarity index 100%
rename from test/app/views/editor/scripts_tab_view.coffee
rename to test/app/views/editor/scripts_tab_view.spec.coffee
diff --git a/test/app/views/editor/settings_tab_view.coffee b/test/app/views/editor/settings_tab_view.spec.coffee
similarity index 100%
rename from test/app/views/editor/settings_tab_view.coffee
rename to test/app/views/editor/settings_tab_view.spec.coffee
diff --git a/test/app/views/editor/systems_tab_view.coffee b/test/app/views/editor/systems_tab_view.spec.coffee
similarity index 100%
rename from test/app/views/editor/systems_tab_view.coffee
rename to test/app/views/editor/systems_tab_view.spec.coffee
diff --git a/test/app/views/editor/thangs_tab_view.coffee b/test/app/views/editor/thangs_tab_view.spec.coffee
similarity index 100%
rename from test/app/views/editor/thangs_tab_view.coffee
rename to test/app/views/editor/thangs_tab_view.spec.coffee