diff --git a/airtime_mvc/tests/README.txt b/airtime_mvc/tests/README.txt
index adc5beb83..6c7256799 100644
--- a/airtime_mvc/tests/README.txt
+++ b/airtime_mvc/tests/README.txt
@@ -34,9 +34,3 @@ with a version that's incompatible and gives an error for us.
 
     IMPORTANT: Make sure you use "sudo" with the "-E" flag so it preserves the environment variable we set before that.
 
-
-
-FAQ
-====
-- If you get errors about an AMPQ fwrite failing, it means your RabbitMQ credentials are wrong in airtime.conf.
-  (That's the airtime.conf in this directory.)
diff --git a/airtime_mvc/tests/TODO.txt b/airtime_mvc/tests/TODO.txt
deleted file mode 100644
index 751b596d8..000000000
--- a/airtime_mvc/tests/TODO.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-TODO:
-- Set up a RabbitMQ airtime_test user that is hardcoded
diff --git a/airtime_mvc/tests/airtime.conf b/airtime_mvc/tests/airtime.conf
index 5aa1b4d92..fb19bcaa0 100755
--- a/airtime_mvc/tests/airtime.conf
+++ b/airtime_mvc/tests/airtime.conf
@@ -9,7 +9,7 @@ host = 127.0.0.1
 port = 5672
 user = airtime_tests
 password = airtime_tests
-vhost = /airtime
+vhost = /airtime_tests
 
 [general]
 api_key = H2NRICX6CM8F50CU123C
diff --git a/airtime_mvc/tests/runtests.sh b/airtime_mvc/tests/runtests.sh
index 975299b0d..ab910ad02 100755
--- a/airtime_mvc/tests/runtests.sh
+++ b/airtime_mvc/tests/runtests.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
+#Create a RabbitMQ airtime_tests user
+
 rabbitmqctl start_app
 
-RABBITMQ_VHOST="/airtime"
+RABBITMQ_VHOST="/airtime_tests"
 RABBITMQ_USER="airtime_tests"
 RABBITMQ_PASSWORD="airtime_tests"
 EXCHANGES="airtime-pypo|pypo-fetch|airtime-media-monitor|media-monitor"