diff --git a/Makefile b/Makefile
index f3b53d4c7..c1712d11b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 test: deps
-	@find test -name '*_test.coffee' | xargs -n 1 -t coffee
+	@find test -name '*.coffee' | xargs -n 1 -t coffee
 
 dev: generate-js
 	@coffee -wc --bare -o lib src/*.coffee
diff --git a/test/scripts/test.coffee b/test/scripts/hubot_test.coffee
similarity index 100%
rename from test/scripts/test.coffee
rename to test/scripts/hubot_test.coffee
diff --git a/test/speak_test.coffee b/test/scripts/speak_test.coffee
similarity index 87%
rename from test/speak_test.coffee
rename to test/scripts/speak_test.coffee
index 27d95e794..929264c6f 100644
--- a/test/speak_test.coffee
+++ b/test/scripts/speak_test.coffee
@@ -1,8 +1,8 @@
-Tests  = require('./tests')
+Tests  = require('../tests')
 assert = require 'assert'
 helper = Tests.helper()
 
-require('../src/scripts/speak') helper
+require('../../src/scripts/speak') helper
 
 process.env.HUBOT_MSTRANSLATE_APIKEY ||= "0xDEADBEEF"