killbill-uncached

diff --git a/profiles/killbill/src/main/java/org/killbill/billing/server/modules/KillbillServerModule.java b/profiles/killbill/src/main/java/org/killbill/billing/server/modules/KillbillServerModule.java
index 00c0b9f..8d19409 100644
--- a/profiles/killbill/src/main/java/org/killbill/billing/server/modules/KillbillServerModule.java
+++ b/profiles/killbill/src/main/java/org/killbill/billing/server/modules/KillbillServerModule.java
@@ -96,6 +96,8 @@ public class KillbillServerModule extends KillbillPlatformModule {
 
         dbi.registerMapper(new AuditLogModelDaoMapper());
         dbi.registerMapper(new RecordIdIdMappingsMapper());
+        queueDbi.registerMapper(new AuditLogModelDaoMapper());
+        queueDbi.registerMapper(new RecordIdIdMappingsMapper());
     }
 
     @Override

diff --git a/util/src/test/java/org/killbill/billing/GuicyKillbillTestWithEmbeddedDBModule.java b/util/src/test/java/org/killbill/billing/GuicyKillbillTestWithEmbeddedDBModule.java
index 2325803..c698b6f 100644
--- a/util/src/test/java/org/killbill/billing/GuicyKillbillTestWithEmbeddedDBModule.java
+++ b/util/src/test/java/org/killbill/billing/GuicyKillbillTestWithEmbeddedDBModule.java
@@ -26,8 +26,11 @@ import org.killbill.billing.platform.api.KillbillConfigSource;
 import org.killbill.billing.platform.test.config.TestKillbillConfigSource;
 import org.killbill.billing.platform.test.glue.TestPlatformModuleWithEmbeddedDB;
 import org.killbill.commons.embeddeddb.EmbeddedDB;
+import org.killbill.queue.DefaultQueueLifecycle;
 import org.skife.jdbi.v2.IDBI;
 
+import com.google.inject.name.Names;
+
 public class GuicyKillbillTestWithEmbeddedDBModule extends GuicyKillbillTestModule {
 
     private final boolean withOSGI;
@@ -62,6 +65,7 @@ public class GuicyKillbillTestWithEmbeddedDBModule extends GuicyKillbillTestModu
             try {
                 bind(DataSource.class).toInstance(instance.getDataSource());
                 bind(IDBI.class).toInstance(dbTestingHelper.getDBI());
+                bind(IDBI.class).annotatedWith(Names.named(DefaultQueueLifecycle.QUEUE_NAME)).toInstance(dbTestingHelper.getDBI());
             } catch (final IOException e) {
                 throw new RuntimeException(e);
             }