diff --git a/src/ggs_gamevm.erl b/src/ggs_gamevm.erl
index 6dd19a7..babee27 100644
--- a/src/ggs_gamevm.erl
+++ b/src/ggs_gamevm.erl
@@ -97,34 +97,3 @@ code_change(_OldVsn, State, _Extra) ->
 js_escape(S) ->
 	lists:flatmap(fun($\') -> [$\\, $\']; (X) -> [X] end, S).
 
-%% ----------------------------------------------------------------------
-% Tests
-
-start_link_test() ->
-    erlang_js:start(), %% @TODO: should only be done once
-	GameVM = start_link(test_table),
-	?assertNot(GameVM =:= undefined).
-	
-define_test() ->
-    GameVM = start_link(test_table),
-    define(GameVM, "function hello(test) { return test; }"),
-    ?assertMatch(<<"jeena">>, gen_server:call(GameVM, {eval, "hello('jeena')"})).
-    
-stop_test() ->
-	GameVM = start_link(test_table),
-	ok = stop(GameVM).
-
-user_command_test() ->
-    GameVM = start_link(test_table),
-    define(GameVM, "var t = '';\nfunction userCommand(user, command, args) { t = user + command + args; }\n"),
-    user_command(GameVM, "'jeena", "thecommand", "theargs'"),
-    ?assertMatch(<<"'jeenathecommandtheargs'">>, gen_server:call(GameVM, {eval, "t;"})).
-
-js_erlang_test() ->
-    GameVM = start_link(test_table),
-    define(GameVM, "var t = '';\nfunction userCommand(user, command, args) { t = callErlang('erlang time') + ''; }\n"),
-    user_command(GameVM, "", "", ""),
-	{A, B, C} = erlang:time(),
-	T = "{" ++ integer_to_list(A) ++ ", " ++ integer_to_list(B) ++ ", " ++ integer_to_list(C) ++ "}",
-	?assertMatch(T, binary_to_list(gen_server:call(GameVM, {eval, "t;"}))).
-
diff --git a/tests/ggs_gamevm_test.erl b/tests/ggs_gamevm_test.erl
new file mode 100644
index 0000000..1689dd1
--- /dev/null
+++ b/tests/ggs_gamevm_test.erl
@@ -0,0 +1,31 @@
+-module(ggs_gamevm_test).
+-include_lib("eunit/include/eunit.hrl").
+
+start_link_test() ->
+    erlang_js:start(), %% @TODO: should only be done once
+	GameVM = start_link(test_table),
+	?assertNot(GameVM =:= undefined).
+	
+define_test() ->
+    GameVM = start_link(test_table),
+    define(GameVM, "function hello(test) { return test; }"),
+    ?assertMatch(<<"jeena">>, gen_server:call(GameVM, {eval, "hello('jeena')"})).
+    
+stop_test() ->
+	GameVM = start_link(test_table),
+	ok = stop(GameVM).
+
+user_command_test() ->
+    GameVM = start_link(test_table),
+    define(GameVM, "var t = '';\nfunction userCommand(user, command, args) { t = user + command + args; }\n"),
+    user_command(GameVM, "'jeena", "thecommand", "theargs'"),
+    ?assertMatch(<<"'jeenathecommandtheargs'">>, gen_server:call(GameVM, {eval, "t;"})).
+
+js_erlang_test() ->
+    GameVM = start_link(test_table),
+    define(GameVM, "var t = '';\nfunction userCommand(user, command, args) { t = callErlang('erlang time') + ''; }\n"),
+    user_command(GameVM, "", "", ""),
+	{A, B, C} = erlang:time(),
+	T = "{" ++ integer_to_list(A) ++ ", " ++ integer_to_list(B) ++ ", " ++ integer_to_list(C) ++ "}",
+	?assertMatch(T, binary_to_list(gen_server:call(GameVM, {eval, "t;"}))).
+