diff --git a/jme3-core/build.gradle b/jme3-core/build.gradle
index 8d55c3e76..185eef0a0 100644
--- a/jme3-core/build.gradle
+++ b/jme3-core/build.gradle
@@ -13,10 +13,24 @@ sourceSets {
     test {
         java {
             srcDir 'src/test/java'
+            srcDir 'src/plugins/java'
         }
     }
 }
 
+configurations {
+    testOutput.extendsFrom testCompile
+}
+
+task testJar(type: Jar) {
+    classifier "test"
+    from sourceSets.test.output
+}
+
+artifacts {
+    testOutput testJar
+}
+
 task updateVersionPropertiesFile << {
     def verfile = file('src/main/resources/com/jme3/system/version.properties')
     verfile.text = "# THIS IS AN AUTO-GENERATED FILE..\n" +
@@ -35,5 +49,3 @@ task updateVersionPropertiesFile << {
 
 compileJava.dependsOn(updateVersionPropertiesFile)
 
-dependencies {
-}
diff --git a/jme3-core/src/main/java/com/jme3/app/Application.java b/jme3-core/src/main/java/com/jme3/app/Application.java
index 81fdb6d3b..c3591d707 100644
--- a/jme3-core/src/main/java/com/jme3/app/Application.java
+++ b/jme3-core/src/main/java/com/jme3/app/Application.java
@@ -519,6 +519,17 @@ public class Application implements SystemListener {
         context.create(waitFor);
     }
 
+    /**
+     * Determine if the application has already started.
+     * 
+     * After {@link #start() } but before {@link #stop() }.
+     * 
+     * @return if started
+     */
+    public boolean isStarted() {
+        return context != null && context.isCreated();
+    }
+    
     /**
      * Internal use only.
      */
@@ -726,6 +737,7 @@ public class Application implements SystemListener {
             audioRenderer.cleanup();
 
         timer.reset();
+        context = null;
     }
 
     /**
diff --git a/jme3-lwjgl/build.gradle b/jme3-lwjgl/build.gradle
index c7154d809..eb5651fd4 100644
--- a/jme3-lwjgl/build.gradle
+++ b/jme3-lwjgl/build.gradle
@@ -6,4 +6,6 @@ dependencies {
     compile project(':jme3-core')
     compile project(':jme3-desktop')
     compile 'org.lwjgl.lwjgl:lwjgl:2.9.3'
+
+    testCompile project(path: ':jme3-core', configuration: 'testOutput')
 }
diff --git a/jme3-lwjgl/src/test/java/com/jme3/app/LwjglAppTest.java b/jme3-lwjgl/src/test/java/com/jme3/app/LwjglAppTest.java
new file mode 100644
index 000000000..ebc20ef29
--- /dev/null
+++ b/jme3-lwjgl/src/test/java/com/jme3/app/LwjglAppTest.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2009-2015 jMonkeyEngine
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'jMonkeyEngine' nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.jme3.app;
+import com.jme3.renderer.RenderManager;
+import com.jme3.system.JmeContext;
+import java.awt.GraphicsEnvironment;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import static org.junit.Assert.*;
+import static org.junit.Assume.*;
+import org.junit.Before;
+import org.junit.Test;
+
+public class LwjglAppTest {
+    
+    private final AtomicInteger simpleInitAppInvocations = new AtomicInteger();
+    private final AtomicInteger simpleUpdateInvocations = new AtomicInteger();
+    private final AtomicInteger simpleRenderInvocations = new AtomicInteger();
+    
+    private class TestApp extends SimpleApplication {
+
+        @Override
+        public void simpleInitApp() {
+            simpleInitAppInvocations.incrementAndGet();
+        }
+
+        @Override
+        public void simpleUpdate(float tpf) {
+            simpleUpdateInvocations.incrementAndGet();
+        }
+        
+        @Override
+        public void simpleRender(RenderManager rm) {
+            simpleRenderInvocations.incrementAndGet();
+        }
+    }
+    
+    public void doStopStart(Application app, JmeContext.Type type) throws InterruptedException {
+        app.setLostFocusBehavior(LostFocusBehavior.Disabled);
+        
+        // start the application - simple init / update will be called once.
+        app.start(type, true); assert app.isStarted();
+        
+        // stop the application, wait a bit, then start it again.
+        app.stop(true);  assert !app.isStarted();
+        
+        Thread.sleep(100);
+        
+        app.start(type, true); assert app.isStarted();
+        app.stop(true);  assert !app.isStarted();
+        
+        // make sure each method was called twice.
+        assertEquals(2, simpleInitAppInvocations.get());
+        assertEquals(2, simpleUpdateInvocations.get());
+        assertEquals(2, simpleRenderInvocations.get());
+    }
+    
+    @Before
+    public void setUp() {
+        Logger.getLogger("com.jme3").setLevel(Level.OFF);
+    }
+    
+    @Test
+    public void testDisplayApp() throws InterruptedException {
+        assumeFalse(GraphicsEnvironment.isHeadless());
+        doStopStart(new TestApp(), JmeContext.Type.Display);
+    }
+    
+    @Test
+    public void testOffscreenSurface() throws InterruptedException {
+        doStopStart(new TestApp(), JmeContext.Type.OffscreenSurface);
+    }
+    
+    @Test
+    public void testHeadlessApp() throws InterruptedException {
+        doStopStart(new TestApp(), JmeContext.Type.Headless);
+    }
+}