Index: oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java	(revision 1808222)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java	(working copy)
@@ -32,7 +32,6 @@
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Root;
 import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
 import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
 import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
 import org.apache.jackrabbit.oak.plugins.index.counter.NodeCounterEditorProvider;
@@ -99,8 +98,6 @@
             Namespaces.setupNamespaces(system);
         }
 
-        BundlingConfigInitializer.INSTANCE.initialize(builder);
-
         NodeBuilder versionStorage = builder.child(JCR_SYSTEM)
                 .child(JCR_VERSIONSTORAGE);
         if (prePopulateVS && !isInitialized(versionStorage)) {
Index: oak-core/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java
===================================================================
--- oak-core/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java	(revision 1808222)
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java	(working copy)
@@ -24,6 +24,7 @@
 import static org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigHandler.BUNDLOR;
 import static org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigHandler.DOCUMENT_NODE_STORE;
 import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -65,7 +66,6 @@
     @Test
     public void bundlingConfig() throws Exception{
         NodeState system = InitialContent.INITIAL_CONTENT.getChildNode(JCR_SYSTEM);
-        assertTrue(system.getChildNode(DOCUMENT_NODE_STORE).exists());
-        assertTrue(system.getChildNode(DOCUMENT_NODE_STORE).getChildNode(BUNDLOR).exists());
+        assertFalse(system.getChildNode(DOCUMENT_NODE_STORE).exists());
     }
 }
Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledDocumentDifferTest.java
===================================================================
--- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledDocumentDifferTest.java	(revision 1808222)
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledDocumentDifferTest.java	(working copy)
@@ -89,6 +89,7 @@
 
         NodeBuilder builder = store.getRoot().builder();
         new InitialContent().initialize(builder);
+        BundlingConfigInitializer.INSTANCE.initialize(builder);
         builder.getChildNode("jcr:system")
                 .getChildNode(DOCUMENT_NODE_STORE)
                 .getChildNode(BUNDLOR)
Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
===================================================================
--- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java	(revision 1808222)
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java	(working copy)
@@ -114,6 +114,7 @@
 
         NodeBuilder builder = store.getRoot().builder();
         new InitialContent().initialize(builder);
+        BundlingConfigInitializer.INSTANCE.initialize(builder);
         builder.getChildNode("jcr:system")
                 .getChildNode(DOCUMENT_NODE_STORE)
                 .getChildNode(BUNDLOR)
Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheTest.java
===================================================================
--- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheTest.java	(revision 1808222)
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheTest.java	(working copy)
@@ -35,6 +35,7 @@
 import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
 import org.apache.jackrabbit.oak.plugins.document.bundlor.BundledTypesRegistry;
 import org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigHandler;
+import org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
 import org.apache.jackrabbit.oak.plugins.document.util.Utils;
 import org.apache.jackrabbit.oak.plugins.index.PathFilter;
 import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
@@ -232,6 +233,7 @@
 
         NodeBuilder builder = primary.getRoot().builder();
         new InitialContent().initialize(builder);
+        BundlingConfigInitializer.INSTANCE.initialize(builder);
         merge(builder);
 
         BundledTypesRegistry registry = BundledTypesRegistry.from(NodeStateUtils.getNode(primary.getRoot(),
Index: oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
===================================================================
--- oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java	(revision 1808222)
+++ oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java	(working copy)
@@ -32,6 +32,7 @@
 import org.apache.jackrabbit.oak.commons.FixturesHelper;
 import org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture;
 import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
+import org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
 import org.apache.jackrabbit.oak.query.QueryEngineSettings;
 import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
 import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
@@ -110,6 +111,7 @@
     protected Jcr initJcr(Jcr jcr) {
         QueryEngineSettings qs = new QueryEngineSettings();
         qs.setFullTextComparisonWithoutIndex(true);
+        jcr.with(BundlingConfigInitializer.INSTANCE);
         return jcr.withAsyncIndexing().with(qs);
     }
 
Index: oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
===================================================================
--- oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java	(revision 1808222)
+++ oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java	(working copy)
@@ -41,6 +41,7 @@
 import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
 import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
 import org.apache.jackrabbit.oak.plugins.document.bundlor.BundledTypesRegistry;
+import org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
 import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
 import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
 import org.apache.jackrabbit.oak.plugins.document.util.Utils;
@@ -219,6 +220,7 @@
                 .build();
         NodeBuilder builder = store.getRoot().builder();
         new InitialContent().initialize(builder);
+        BundlingConfigInitializer.INSTANCE.initialize(builder);
         builder.getChildNode("jcr:system")
                 .getChildNode(DOCUMENT_NODE_STORE)
                 .getChildNode(BUNDLOR)