diff --git a/demos/tweetstore/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java b/demos/tweetstore/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
index 7f314232f9..974bafb9f0 100644
--- a/demos/tweetstore/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
+++ b/demos/tweetstore/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
@@ -43,6 +43,7 @@ import org.jclouds.demo.tweetstore.config.SpringServletConfig;
 import org.jclouds.demo.tweetstore.controller.StoreTweetsController;
 import org.jclouds.logging.log4j.config.Log4JLoggingModule;
 import org.jclouds.util.Strings2;
+import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
@@ -224,4 +225,9 @@ public class TweetStoreLiveTest {
       String string = Strings2.toStringAndClose(i);
       assert string.indexOf("Tweets in Clouds") >= 0 : string;
    }
+
+   @AfterTest
+   public void stopDevAppServer() throws Exception {
+       server.stop();
+   }
 }