diff --git a/test/commands_test.exs b/test/commands_test.exs
index 633e152..906ba6a 100644
--- a/test/commands_test.exs
+++ b/test/commands_test.exs
@@ -1,43 +1,43 @@
 defmodule ExIrc.CommandsTest do
-  use ExUnit.Case
+  use ExUnit.Case, async: true
 
   use Irc.Commands
 
   test "Commands are formatted properly" do
   	assert [1, 'TESTCMD', 1] == ctcp! 'TESTCMD'
   	assert [1, 'TESTCMD', 1] == ctcp! "TESTCMD"
   	assert [['PASS ', 'testpass'], '\r\n'] == pass! 'testpass'
   	assert [['PASS ', 'testpass'], '\r\n'] == pass! "testpass"
   	assert [['NICK ', 'testnick'], '\r\n'] == nick! 'testnick'
   	assert [['NICK ', 'testnick'], '\r\n'] == nick! "testnick"
   	assert [['USER ', 'testuser', ' 0 * :', 'Test User'], '\r\n'] == user! 'testuser', 'Test User'
   	assert [['USER ', 'testuser', ' 0 * :', 'Test User'], '\r\n'] == user! "testuser", 'Test User'
   	assert [['USER ', 'testuser', ' 0 * :', 'Test User'], '\r\n'] == user! 'testuser', "Test User"
   	assert [['USER ', 'testuser', ' 0 * :', 'Test User'], '\r\n'] == user! "testuser", "Test User"
   	assert [['PONG ', 'testnick'], '\r\n'] == pong1! 'testnick' 
   	assert [['PONG ', 'testnick'], '\r\n'] == pong1! "testnick"
   	assert [['PONG ', 'testnick', ' ', 'othernick'], '\r\n'] == pong2! 'testnick', 'othernick'
   	assert [['PONG ', 'testnick', ' ', 'othernick'], '\r\n'] == pong2! "testnick", 'othernick'
   	assert [['PONG ', 'testnick', ' ', 'othernick'], '\r\n'] == pong2! 'testnick', "othernick"
   	assert [['PONG ', 'testnick', ' ', 'othernick'], '\r\n'] == pong2! "testnick", "othernick"
   	assert [['PRIVMSG ', 'testnick', ' :', 'Test message!'], '\r\n'] == privmsg! 'testnick', 'Test message!'
   	assert [['PRIVMSG ', 'testnick', ' :', 'Test message!'], '\r\n'] == privmsg! "testnick", 'Test message!'
   	assert [['PRIVMSG ', 'testnick', ' :', 'Test message!'], '\r\n'] == privmsg! 'testnick', "Test message!"
   	assert [['PRIVMSG ', 'testnick', ' :', 'Test message!'], '\r\n'] == privmsg! "testnick", "Test message!"
   	assert [['NOTICE ', 'testnick', ' :', 'Test notice!'], '\r\n'] == notice! 'testnick', 'Test notice!'
   	assert [['NOTICE ', 'testnick', ' :', 'Test notice!'], '\r\n'] == notice! "testnick", 'Test notice!'
   	assert [['NOTICE ', 'testnick', ' :', 'Test notice!'], '\r\n'] == notice! 'testnick', "Test notice!"
   	assert [['NOTICE ', 'testnick', ' :', 'Test notice!'], '\r\n'] == notice! "testnick", "Test notice!"
   	assert [['JOIN ', 'testchan', ' ', ''], '\r\n'] == join! 'testchan'
   	assert [['JOIN ', 'testchan', ' ', ''], '\r\n'] == join! "testchan"
   	assert [['JOIN ', 'testchan', ' ', 'chanpass'], '\r\n'] == join! 'testchan', 'chanpass'
   	assert [['JOIN ', 'testchan', ' ', 'chanpass'], '\r\n'] == join! "testchan", 'chanpass'
   	assert [['JOIN ', 'testchan', ' ', 'chanpass'], '\r\n'] == join! 'testchan', "chanpass"
   	assert [['JOIN ', 'testchan', ' ', 'chanpass'], '\r\n'] == join! "testchan", "chanpass"
   	assert [['PART ', 'testchan'], '\r\n'] == part! 'testchan'
   	assert [['PART ', 'testchan'], '\r\n'] == part! "testchan"
   	assert [['QUIT :', 'Leaving'], '\r\n'] == quit!
   	assert [['QUIT :', 'Goodbye, cruel world.'], '\r\n'] == quit! 'Goodbye, cruel world.'
   	assert [['QUIT :', 'Goodbye, cruel world.'], '\r\n'] == quit! "Goodbye, cruel world."
   end
 end
\ No newline at end of file
diff --git a/test/utils_test.exs b/test/utils_test.exs
index e867a62..9add674 100644
--- a/test/utils_test.exs
+++ b/test/utils_test.exs
@@ -1,37 +1,37 @@
 defmodule ExIrc.UtilsTest do
-  use ExUnit.Case
+  use ExUnit.Case, async: true
 
   use Irc.Commands
 
   alias ExIrc.Utils, as: Utils
   alias ExIrc.Client.IrcMessage, as: IrcMessage
   alias ExIrc.Client.ClientState, as: ClientState
 
   doctest ExIrc.Utils
 
   test "Given a local date/time as a tuple, can retrieve get the CTCP formatted time" do
   	local_time = {{2013,12,6},{14,5,00}} # Mimics output of :calendar.local_time()
   	assert Utils.ctcp_time(local_time) == 'Fri Dec 06 14:05:00 2013'
   end
 
   test "Can parse an IRC message" do
   	message = ':irc.example.org 005 nick NETWORK=Freenode PREFIX=(ov)@+ CHANTYPES=#&'
   	assert IrcMessage[
       server: 'irc.example.org',
       cmd:    @rpl_isupport,
       args:   ['nick', 'NETWORK=Freenode', 'PREFIX=(ov)@+', 'CHANTYPES=#&']
     ] = Utils.parse(message)
   end
 
   test "Can parse RPL_ISUPPORT commands" do
     message = ':irc.example.org 005 nick NETWORK=Freenode PREFIX=(ov)@+ CHANTYPES=#&'
     parsed  = Utils.parse(message)
     state   = ClientState.new()
     assert ClientState[
       channel_prefixes: [?#, ?&],
       user_prefixes:    [{?o, ?@}, {?v, ?+}],
       network:          'Freenode'
     ] = Utils.isup(parsed.args, state)
   end
 
 end