diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java
index 4e5d1746..19cd4b1b 100644
--- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java
+++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java
@@ -75,7 +75,7 @@ public class FtpOutboundChannelAdapterSample {
 		assertTrue(new File(TestSuite.FTP_ROOT_DIR + File.separator + "b.txt").exists());
 
 		LOGGER.info("Successfully transfered file 'a.txt' and 'b.txt' to a remote FTP location.");
-
+		ctx.close();
 	}
 
 	@After
diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java
index 1150977c..5ad7ff27 100644
--- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java
+++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java
@@ -15,11 +15,12 @@
  */
 package org.springframework.integration.samples.mongodb.util;
 
+import com.mongodb.MongoClient;
+
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 
-import com.mongodb.Mongo;
 /**
  *
  * @author Oleg Zhurakousky
@@ -27,7 +28,7 @@ import com.mongodb.Mongo;
 public class DemoUtils {
 
 	public static MongoDbFactory prepareMongoFactory(String... additionalCollectionToDrop) throws Exception{
-		MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(new Mongo(), "test");
+		MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(new MongoClient(), "test");
 		MongoTemplate template = new MongoTemplate(mongoDbFactory);
 		template.dropCollection("messages");
 		template.dropCollection("data");
diff --git a/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java b/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java
index 2fe37616..6f20ca73 100644
--- a/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java
+++ b/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java
@@ -10,7 +10,8 @@ import java.io.FileWriter;
 import org.apache.log4j.Logger;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.context.ApplicationContext;
+
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.messaging.PollableChannel;
 
@@ -42,13 +43,14 @@ public class FileProcessingTest {
 		    out.close();
 		}
 		logger.info("Populated directory with files");
-		Thread.sleep(5000);
+		Thread.sleep(2000);
 		logger.info("Starting Spring Integration Sequential File processing");
-		ApplicationContext ac = new ClassPathXmlApplicationContext("META-INF/spring/integration/sequentialFileProcessing-config.xml");
+		ConfigurableApplicationContext ac = new ClassPathXmlApplicationContext("META-INF/spring/integration/sequentialFileProcessing-config.xml");
 		PollableChannel filesOutChannel = ac.getBean("filesOutChannel", PollableChannel.class);
 		for (int i = 0; i < fileCount; i++) {
-			logger.info("Finished processing " + filesOutChannel.receive(20000).getPayload());
+			logger.info("Finished processing " + filesOutChannel.receive(10000).getPayload());
 		}
+		ac.stop();
 	}
 	@Test
 	public void testConcurrentFileProcessing() throws Exception {
@@ -63,10 +65,11 @@ public class FileProcessingTest {
 		logger.info("Populated directory with files");
 		Thread.sleep(2000);
 		logger.info("Starting Spring Integration Sequential File processing");
-		ApplicationContext ac = new ClassPathXmlApplicationContext("/META-INF/spring/integration/concurrentFileProcessing-config.xml");
+		ConfigurableApplicationContext ac = new ClassPathXmlApplicationContext("/META-INF/spring/integration/concurrentFileProcessing-config.xml");
 		PollableChannel filesOutChannel = ac.getBean("filesOutChannel", PollableChannel.class);
 		for (int i = 0; i < fileCount; i++) {
 			logger.info("Finished processing " + filesOutChannel.receive(10000).getPayload());
 		}
+		ac.stop();
 	}
 }