diff --git a/conf/config.py b/conf/config.py
index 825dce34..30f4b161 100644
--- a/conf/config.py
+++ b/conf/config.py
@@ -134,7 +134,7 @@ class TestConfiguration(BaseConfiguration):
     SQLALCHEMY_DATABASE_URI = 'sqlite:///{0}'.format(
         path.join(dbdir, 'tests', 'test_module_build_service.db'))
     DEBUG = True
-    MESSAGING = 'memory'
+    MESSAGING = 'in_memory'
 
     # Global network-related values, in seconds
     NET_TIMEOUT = 3
diff --git a/module_build_service/config.py b/module_build_service/config.py
index aca60a8d..35bbef6e 100644
--- a/module_build_service/config.py
+++ b/module_build_service/config.py
@@ -344,7 +344,7 @@ class Config(object):
 
     def _setifok_messaging(self, s):
         s = str(s)
-        if s not in ("fedmsg", "amq", "memory"):
+        if s not in ("fedmsg", "amq", "in_memory"):
             raise ValueError("Unsupported messaging system.")
         self.messaging = s
 
diff --git a/module_build_service/messaging.py b/module_build_service/messaging.py
index 307bd307..e450dbb2 100644
--- a/module_build_service/messaging.py
+++ b/module_build_service/messaging.py
@@ -344,7 +344,7 @@ _messaging_backends = {
     'amq': {
         'publish': _amq_publish,
     },
-    'memory': {
+    'in_memory': {
         'publish': _in_memory_publish,
     }
 }