diff --git a/samples/odm/src/main/resources/applicationContext.xml b/samples/odm/src/main/resources/applicationContext.xml
index ed686924..22e1f8bd 100644
--- a/samples/odm/src/main/resources/applicationContext.xml
+++ b/samples/odm/src/main/resources/applicationContext.xml
@@ -45,15 +45,4 @@
             <property name="port" value="18880" />
         </bean>
     </beans>
-
-    <beans profile="no-apacheds">
-        <!-- Populates the LDAP server with initial data -->
-        <bean class="org.springframework.ldap.test.LdifPopulator">
-            <property name="contextSource" ref="contextSource" />
-            <property name="resource" value="classpath:/setup_data.ldif" />
-            <property name="base" value="${sample.ldap.base}" />
-            <property name="clean" value="${sample.ldap.clean}" />
-            <property name="defaultBase" value="dc=jayway,dc=se" />
-        </bean>
-    </beans>
 </beans>
diff --git a/samples/plain/src/main/resources/applicationContext.xml b/samples/plain/src/main/resources/applicationContext.xml
index e83b3868..7bc89b78 100644
--- a/samples/plain/src/main/resources/applicationContext.xml
+++ b/samples/plain/src/main/resources/applicationContext.xml
@@ -39,22 +39,11 @@
             This is for test and demo purposes only - EmbeddedLdapServerFactoryBean launches an in-process
             LDAP server.
         -->
-        <bean id="embeddedLdapServer" class="org.springframework.ldap.test.unboundid.EmbeddedLdapServerFactoryBean">
+        <bean id="embeddedLdapServer" class="org.springframework.ldap.test.EmbeddedLdapServerFactoryBean">
             <property name="partitionName" value="jayway"/>
             <property name="partitionSuffix" value="${sample.ldap.base}" />
             <property name="port" value="18880" />
         </bean>
     </beans>
 
-    <beans profile="no-apacheds">
-        <!-- Populates the LDAP server with initial data -->
-        <bean class="org.springframework.ldap.test.LdifPopulator">
-            <property name="contextSource" ref="contextSource" />
-            <property name="resource" value="classpath:/setup_data.ldif" />
-            <property name="base" value="${sample.ldap.base}" />
-            <property name="clean" value="${sample.ldap.clean}" />
-            <property name="defaultBase" value="dc=jayway,dc=se" />
-        </bean>
-    </beans>
-
 </beans>