diff --git a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java
index a83d162d6eb9..c81cc1049308 100644
--- a/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java
+++ b/lucene/lucene-v3/src/test/java/org/infinispan/lucene/DatabaseStoredIndexTest.java
@@ -30,11 +30,9 @@
 import static org.infinispan.lucene.CacheTestSupport.writeTextToIndex;
 
 import org.apache.lucene.store.Directory;
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.loaders.jdbc.TableManipulation;
+import org.infinispan.configuration.cache.ConfigurationBuilder;
+import org.infinispan.loaders.jdbc.configuration.JdbcStringBasedCacheStoreConfigurationBuilder;
 import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStoreConfig;
 import org.infinispan.lucene.directory.DirectoryBuilder;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.test.SingleCacheManagerTest;
@@ -46,41 +44,35 @@
 
 /**
  * Test to verify that it's possible to use the index using a JdbcStringBasedCacheStore
- * 
+ *
  * @see org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore
- * 
+ *
  * @author Sanne Grinovero
  * @since 4.1
  */
 @SuppressWarnings("unchecked")
 @Test(groups = "functional", testName = "lucene.DatabaseStoredIndexTest")
 public class DatabaseStoredIndexTest extends SingleCacheManagerTest {
-   
+
    private final ConnectionFactoryConfig connectionFactoryConfig = UnitTestDatabaseManager.getUniqueConnectionFactoryConfig();
-   
+
    /** The INDEX_NAME */
    private static final String INDEX_NAME = "testing index";
-   
+
    private final HashMap cacheCopy = new HashMap();
-   
+
    public DatabaseStoredIndexTest() {
       cleanup = CleanupPhase.AFTER_METHOD;
    }
-   
+
    @Override
    protected EmbeddedCacheManager createCacheManager() throws Exception {
-      Configuration configuration = CacheTestSupport.createLegacyTestConfiguration();
-      enableTestJdbcStorage(configuration);
-      return TestCacheManagerFactory.createClusteredCacheManager(configuration);
-   }
-   
-   private void enableTestJdbcStorage(Configuration configuration) {
-      TableManipulation tm = UnitTestDatabaseManager.buildStringTableManipulation();
-      JdbcStringBasedCacheStoreConfig jdbcStoreConfiguration = new JdbcStringBasedCacheStoreConfig(connectionFactoryConfig, tm);
-      jdbcStoreConfiguration.setKey2StringMapperClass(LuceneKey2StringMapper.class.getName());
-      CacheLoaderManagerConfig loaderManagerConfig = configuration.getCacheLoaderManagerConfig();
-      loaderManagerConfig.setPreload(Boolean.FALSE);
-      loaderManagerConfig.addCacheLoaderConfig(jdbcStoreConfiguration);
+      ConfigurationBuilder cb = TestCacheManagerFactory.getDefaultCacheConfiguration(false);
+      cb.loaders().preload(false);
+      JdbcStringBasedCacheStoreConfigurationBuilder sbcscb = new JdbcStringBasedCacheStoreConfigurationBuilder(cb.loaders());
+      sbcscb.key2StringMapper(LuceneKey2StringMapper.class.getName());
+
+      return TestCacheManagerFactory.createClusteredCacheManager(cb);
    }
 
    @Test
@@ -100,7 +92,7 @@ public void testIndexUsage() throws IOException {
       cache.stop();
       cacheManager.stop();
    }
-   
+
    @Test(dependsOnMethods="testIndexUsage")
    public void indexWasStored() throws IOException {
       cache = cacheManager.getCache();
@@ -132,5 +124,5 @@ public void indexWasStored() throws IOException {
       assertTextIsFoundInIds(dir, "index", 1);
       dir.close();
    }
-   
+
 }