diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 371d01dc7b0..d23c6145ca4 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -489,6 +489,7 @@
 	      <arguments>
 		<argument>jetty.home=${assembly-directory}</argument>
 		<argument>jetty.base=${assembly-directory}/demo-base</argument>
+		<argument>--add-to-start=server,deploy,jsp,ext,resources,client,annotations,jndi</argument>
 		<argument>--add-to-startd-ini=http,https</argument>
 	      </arguments>
 	    </configuration>
diff --git a/jetty-jsp/src/main/config/modules/jsp.mod b/jetty-jsp/src/main/config/modules/jsp.mod
index f85530d3c8a..7c3cfa4b578 100644
--- a/jetty-jsp/src/main/config/modules/jsp.mod
+++ b/jetty-jsp/src/main/config/modules/jsp.mod
@@ -8,3 +8,6 @@ servlet
 [lib]
 lib/jsp/*.jar
 
+[ini-template]
+# To use an non-jdk compiler for JSP compilation uncomment next line
+#-Dorg.apache.jasper.compiler.disablejsr199=true
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini
index e625afec2c3..9a840f4db07 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini
+++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini
@@ -4,16 +4,6 @@
 # Additional ini files are in demo-base/start.d
 # 
 
-# Have webapps be deployed normally from webapps directory
---module=deploy
-
-# Some of the examples use JSP
---module=jsp
-
-# We are using annotations + jndi
---module=annotations
---module=jndi
-
 # Enable security via jaas, and configure it
 --module=jaas
 jaas.login.conf=etc/login.conf
@@ -22,9 +12,6 @@ jaas.login.conf=etc/login.conf
 --module=rewrite
 etc/demo-rewrite-rules.xml
 
-# The async behavior examples use http client to access remote systems
---module=client
-
 # Websocket chat examples needs websocket enabled
 # Don't start for all contexts (set to true in test.xml context)
 org.eclipse.jetty.websocket.jsr356=false
@@ -34,7 +21,3 @@ org.eclipse.jetty.websocket.jsr356=false
 etc/test-realm.xml
 demo.realm=etc/realm.properties
 
-# Load test JNDI resources from lib/ext
---module=ext
-
-