diff --git a/.gitignore b/.gitignore
index fa36062721..137f36a9d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ dist/
 host-syslog.log
 tags
 .tox
-rdtest.log
+trovetest.log
 trove/versioninfo
 AUTHORS
 ChangeLog
diff --git a/bin/start_server.sh b/bin/start-fake-mode.sh
similarity index 93%
rename from bin/start_server.sh
rename to bin/start-fake-mode.sh
index 2f3e368231..a4fbf95257 100755
--- a/bin/start_server.sh
+++ b/bin/start-fake-mode.sh
@@ -12,7 +12,7 @@ function run() {
 run bin/trove-manage \
     --config-file=etc/trove/trove.conf.test db_wipe \
     trove_test.sqlite mysql fake
-run bin/trove-server \
+run bin/trove-fake-mode \
     --fork --config-file=etc/trove/trove.conf.test \
     $@
 
diff --git a/bin/stop_server.sh b/bin/stop-fake-mode.sh
similarity index 100%
rename from bin/stop_server.sh
rename to bin/stop-fake-mode.sh
diff --git a/bin/trove-api b/bin/trove-api
index 88aa25fce4..69699029dc 100755
--- a/bin/trove-api
+++ b/bin/trove-api
@@ -41,6 +41,7 @@ from trove.db import get_db_api
 
 CONF = cfg.CONF
 
+
 if __name__ == '__main__':
     cfg.parse_args(sys.argv)
     logging.setup(None)
diff --git a/bin/trove-server b/bin/trove-fake-mode
similarity index 86%
rename from bin/trove-server
rename to bin/trove-fake-mode
index 4b593402df..ee393ffb66 100755
--- a/bin/trove-server
+++ b/bin/trove-fake-mode
@@ -54,13 +54,23 @@ CONF = cfg.CONF
 CONF.register_cli_opts(extra_opts)
 
 
+def start_fake_taskmanager():
+    topic = CONF.taskmanager_queue
+    from trove.openstack.common.rpc import service as rpc_service
+    from trove.taskmanager import manager
+    manager_impl = manager.Manager()
+    taskman_service = rpc_service.Service(None, topic=topic,
+                                          manager=manager_impl)
+    taskman_service.start()
+
+
 def run_server():
     try:
         get_db_api().configure_db(CONF)
         conf_file = CONF.find_file(CONF.api_paste_config)
         launcher = wsgi.launch('trove', CONF.bind_port or 8779, conf_file,
                                workers=CONF.trove_api_workers)
-
+        start_fake_taskmanager()
         launcher.wait()
     except RuntimeError as error:
         import traceback
@@ -68,7 +78,7 @@ def run_server():
         sys.exit("ERROR: %s" % error)
 
 
-if __name__ == '__main__':
+def main():
     cfg.parse_args(sys.argv)
     if CONF.override_logfile:
         CONF.use_stderr = False
@@ -87,3 +97,7 @@ if __name__ == '__main__':
                 f.write(str(pid))
     else:
         run_server()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/etc/trove/trove.conf.test b/etc/trove/trove.conf.test
index 2c8b919567..5b35736f0e 100644
--- a/etc/trove/trove.conf.test
+++ b/etc/trove/trove.conf.test
@@ -12,7 +12,7 @@ rpc_backend = trove.common.rpc.impl_fake
 # This will remove some of the verbose logging when trying to diagnose tox issues
 default_log_levels=routes.middleware=ERROR,trove.common.auth=WARN
 
-log_file = rdtest.log
+log_file = trovetest.log
 
 use_stderr = False
 
diff --git a/setup.cfg b/setup.cfg
index 3b66ef6974..43e328495e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,9 +23,9 @@ packages =
     trove
 scripts =
     bin/trove-api
+    bin/trove-fake-mode
     bin/trove-manage
     bin/trove-mgmt-taskmanager
-    bin/trove-server
     bin/trove-taskmanager
     bin/trove-guestagent