diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/SampleAtomikosApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/SampleAtomikosApplication.java
index c1bc65e29a5..1499cea8905 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/SampleAtomikosApplication.java
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/SampleAtomikosApplication.java
@@ -16,30 +16,28 @@
 
 package smoketest.atomikos;
 
-import java.io.Closeable;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
 
 @SpringBootApplication
 public class SampleAtomikosApplication {
 
 	public static void main(String[] args) throws Exception {
-		ApplicationContext context = SpringApplication.run(SampleAtomikosApplication.class, args);
-		AccountService service = context.getBean(AccountService.class);
-		AccountRepository repository = context.getBean(AccountRepository.class);
-		service.createAccountAndNotify("josh");
-		System.out.println("Count is " + repository.count());
-		try {
-			service.createAccountAndNotify("error");
-		}
-		catch (Exception ex) {
-			System.out.println(ex.getMessage());
+		try (ConfigurableApplicationContext context = SpringApplication.run(SampleAtomikosApplication.class, args)) {
+			AccountService service = context.getBean(AccountService.class);
+			AccountRepository repository = context.getBean(AccountRepository.class);
+			service.createAccountAndNotify("josh");
+			System.out.println("Count is " + repository.count());
+			try {
+				service.createAccountAndNotify("error");
+			}
+			catch (Exception ex) {
+				System.out.println(ex.getMessage());
+			}
+			System.out.println("Count is " + repository.count());
+			Thread.sleep(100);
 		}
-		System.out.println("Count is " + repository.count());
-		Thread.sleep(100);
-		((Closeable) context).close();
 	}
 
 }