diff --git a/testsuite/tools/pom.xml b/testsuite/tools/pom.xml
index e6e0f79002..3d3d2c3256 100755
--- a/testsuite/tools/pom.xml
+++ b/testsuite/tools/pom.xml
@@ -15,6 +15,19 @@
     <description/>
 
     <dependencies>
+
+        <dependency>
+            <groupId>com.icegreen</groupId>
+            <artifactId>greenmail</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-core</artifactId>
diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/DestroyListener.java b/testsuite/tools/src/main/java/org/keycloak/test/tools/DestroyListener.java
new file mode 100644
index 0000000000..99807dcdbf
--- /dev/null
+++ b/testsuite/tools/src/main/java/org/keycloak/test/tools/DestroyListener.java
@@ -0,0 +1,21 @@
+package org.keycloak.test.tools;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+public class DestroyListener implements ServletContextListener {
+    @Override
+    public void contextInitialized(ServletContextEvent sce) {
+
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent sce) {
+        if (KeycloakTestApplication.mail != null) {
+            KeycloakTestApplication.mail.stop();
+        }
+    }
+}
diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/KeycloakTestApplication.java b/testsuite/tools/src/main/java/org/keycloak/test/tools/KeycloakTestApplication.java
index 52e7811007..7184978d64 100644
--- a/testsuite/tools/src/main/java/org/keycloak/test/tools/KeycloakTestApplication.java
+++ b/testsuite/tools/src/main/java/org/keycloak/test/tools/KeycloakTestApplication.java
@@ -5,6 +5,8 @@ import org.keycloak.models.KeycloakSessionFactory;
 import org.keycloak.services.resources.KeycloakApplication;
 
 import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.Context;
 import java.util.HashSet;
@@ -19,6 +21,8 @@ public class KeycloakTestApplication extends Application {
     protected Set<Class<?>> classes = new HashSet<Class<?>>();
     protected Set<Object> singletons = new HashSet<Object>();
 
+    static Mail mail = new Mail();
+
     public KeycloakTestApplication(@Context ServletContext context, @Context Dispatcher dispatcher) {
         KeycloakApplication.loadConfig();
 
@@ -27,6 +31,7 @@ public class KeycloakTestApplication extends Application {
         context.setAttribute(KeycloakSessionFactory.class.getName(), this.sessionFactory);
 
         singletons.add(new PerfTools(sessionFactory));
+        singletons.add(mail);
     }
 
     @Override
diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/Mail.java b/testsuite/tools/src/main/java/org/keycloak/test/tools/Mail.java
new file mode 100644
index 0000000000..ddbfe33a38
--- /dev/null
+++ b/testsuite/tools/src/main/java/org/keycloak/test/tools/Mail.java
@@ -0,0 +1,131 @@
+package org.keycloak.test.tools;
+
+import com.icegreen.greenmail.util.GreenMail;
+import com.icegreen.greenmail.util.ServerSetup;
+
+import javax.mail.internet.MimeMessage;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+@Path("mail")
+public class Mail {
+
+    private GreenMail greenMail;
+
+    @GET
+    @Path("status")
+    @Produces("application/json")
+    public synchronized Status status() {
+        return new Status(greenMail != null);
+    }
+
+    @GET
+    @Path("start")
+    @Produces("application/json")
+    public synchronized Status start() {
+        if (greenMail == null) {
+            ServerSetup setup = new ServerSetup(3025, "localhost", "smtp");
+
+            greenMail = new GreenMail(setup);
+            try {
+                greenMail.start();
+            } catch (Throwable t) {
+                greenMail = null;
+                return new Status(false);
+            }
+        }
+
+        return new Status(true);
+    }
+
+    @GET
+    @Path("stop")
+    @Produces("application/json")
+    public synchronized Status stop() {
+        if (greenMail != null) {
+            greenMail.stop();
+            greenMail = null;
+        }
+
+        return new Status(false);
+    }
+
+    @GET
+    @Path("messages")
+    @Produces("application/json")
+    public synchronized List<Message> getMessages() throws Exception {
+        List<Message> messages = new LinkedList<Message>();
+        if (greenMail != null) {
+            for (MimeMessage m : greenMail.getReceivedMessages()) {
+                messages.add(new Message(m));
+            }
+        }
+        return messages;
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        if (greenMail != null) {
+            greenMail.stop();
+        }
+    }
+
+    public static class Status {
+
+        private boolean started;
+
+        public Status(boolean started) {
+            this.started = started;
+        }
+
+        public boolean isStarted() {
+            return started;
+        }
+
+    }
+
+    public static class Message {
+
+        private String from;
+        private String to;
+        private String subject;
+        private String body;
+        private Long date;
+
+        public Message(MimeMessage m) throws Exception {
+            from = m.getFrom()[0].toString();
+            to = m.getRecipients(MimeMessage.RecipientType.TO)[0].toString();
+            subject = m.getSubject();
+            body = m.getContent().toString();
+            date = m.getSentDate() != null ? m.getSentDate().getTime() : null;
+        }
+
+        public String getFrom() {
+            return from;
+        }
+
+        public String getTo() {
+            return to;
+        }
+
+        public String getSubject() {
+            return subject;
+        }
+
+        public String getBody() {
+            return body;
+        }
+
+        public Long getDate() {
+            return date;
+        }
+
+    }
+
+}
diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/PerfTools.java b/testsuite/tools/src/main/java/org/keycloak/test/tools/PerfTools.java
index 638e064909..2e08ed77e9 100644
--- a/testsuite/tools/src/main/java/org/keycloak/test/tools/PerfTools.java
+++ b/testsuite/tools/src/main/java/org/keycloak/test/tools/PerfTools.java
@@ -65,7 +65,7 @@ public class PerfTools {
 
     @GET
     @Path("{realm}/create-users")
-    public Response createUsers(@PathParam("realm") String realmName, @QueryParam("count") Integer count, @QueryParam("batch") Integer batch, @QueryParam("start") Integer start, @QueryParam("prefix") String prefix, @QueryParam("roles") String roles) throws InterruptedException {
+    public void createUsers(@PathParam("realm") String realmName, @QueryParam("count") Integer count, @QueryParam("batch") Integer batch, @QueryParam("start") Integer start, @QueryParam("prefix") String prefix, @QueryParam("roles") String roles) throws InterruptedException {
         if (count == null) {
             count = 1;
         }
@@ -88,8 +88,6 @@ public class PerfTools {
             int c = s + batch <= (start + count) ? batch : (start + count) - s;
             executor.submit(new CreateUsers(job, sessionFactory, realmName, s, c, prefix, rolesArray));
         }
-
-        return Response.noContent().build();
     }
 
     @GET
diff --git a/testsuite/tools/src/main/webapp/WEB-INF/web.xml b/testsuite/tools/src/main/webapp/WEB-INF/web.xml
index aea2f9c7fe..f899f63945 100755
--- a/testsuite/tools/src/main/webapp/WEB-INF/web.xml
+++ b/testsuite/tools/src/main/webapp/WEB-INF/web.xml
@@ -26,7 +26,7 @@
     </welcome-file-list>
 
     <listener>
-        <listener-class>org.keycloak.services.listeners.KeycloakSessionDestroyListener</listener-class>
+        <listener-class>org.keycloak.test.tools.DestroyListener</listener-class>
     </listener>
 
     <filter>
@@ -54,6 +54,11 @@
         <url-pattern>/perf/*</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>Keycloak REST Interface</servlet-name>
+        <url-pattern>/mail/*</url-pattern>
+    </servlet-mapping>
+
     <!--
 
     <security-constraint>
diff --git a/testsuite/tools/src/main/webapp/index.html b/testsuite/tools/src/main/webapp/index.html
index 19521ec7f4..0b086c5790 100644
--- a/testsuite/tools/src/main/webapp/index.html
+++ b/testsuite/tools/src/main/webapp/index.html
@@ -21,6 +21,7 @@
     <ul class="nav navbar-nav navbar-primary persistent-secondary ng-scope">
         <li><a href="#/">Home</a></li>
         <li><a href="#/perf">Perf</a></li>
+        <li><a href="#/mail">Mail</a></li>
     </ul>
 </header>
 
diff --git a/testsuite/tools/src/main/webapp/js/app.js b/testsuite/tools/src/main/webapp/js/app.js
index 76e4f96b74..87f11ac000 100644
--- a/testsuite/tools/src/main/webapp/js/app.js
+++ b/testsuite/tools/src/main/webapp/js/app.js
@@ -7,6 +7,10 @@ module.config([ '$routeProvider', function ($routeProvider) {
             templateUrl: 'pages/perf.html',
             controller: 'PerfCtrl'
         })
+        .when('/mail', {
+            templateUrl: 'pages/mail.html',
+            controller: 'MailCtrl'
+        })
         .otherwise({
             templateUrl: 'pages/home.html'
         });
@@ -47,3 +51,24 @@ module.controller('PerfCtrl', function ($scope, $resource) {
     $scope.loadJobs();
 
 });
+
+module.controller('MailCtrl', function ($scope, $resource) {
+
+    $scope.start = function() {
+        $resource('/keycloak-tools/mail/start').get({}, function(status) {
+            $scope.status = status;
+        });
+    }
+
+    $scope.stop = function() {
+        $resource('/keycloak-tools/mail/stop').get({}, function(status) {
+            $scope.status = status;
+        });
+    }
+    $scope.loadMessages = function() {
+        $scope.messages = $resource('/keycloak-tools/mail/messages').query();
+    }
+
+    $scope.status = $resource('/keycloak-tools/mail/status').get();
+
+});
diff --git a/testsuite/tools/src/main/webapp/pages/mail.html b/testsuite/tools/src/main/webapp/pages/mail.html
new file mode 100644
index 0000000000..b37801929d
--- /dev/null
+++ b/testsuite/tools/src/main/webapp/pages/mail.html
@@ -0,0 +1,23 @@
+<h1>Mail</h1>
+
+<button data-ng-click="start()" class="btn btn-default" data-ng-show="!status.started">Start</button>
+<button data-ng-click="stop()" class="btn btn-default" data-ng-show="status.started">Stop</button>
+<button data-ng-click="loadMessages()" class="btn btn-default" data-ng-show="status.started">Refresh</button>
+
+<table class="table table-striped table-bordered">
+    <thead>
+    <tr>
+        <th>From</th>
+        <th>To</th>
+        <th>Subject</th>
+        <th>Body</th>
+    </tr>
+    </thead>
+    <tr data-ng-repeat="m in messages|reverse">
+        <td>{{m.from}}</td>
+        <td>{{m.to}}</td>
+        <td>{{m.subject}}</td>
+        <td><pre>{{m.body}}</pre></td>
+        <td>{{m.date|date:'medium'}}</td>
+    </tr>
+</table>
\ No newline at end of file