diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml
index a0e59435dbb..7f0df8da620 100644
--- a/jetty-http2/http2-server/pom.xml
+++ b/jetty-http2/http2-server/pom.xml
@@ -12,6 +12,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
+    <manual.test.port>28888</manual.test.port>
   </properties>
 
   <build>
@@ -25,14 +26,14 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>com.github.madgnome</groupId>
+        <groupId>org.mortbay.jetty</groupId>
         <artifactId>h2spec-maven-plugin</artifactId>
         <configuration>
           <mainClass>org.eclipse.jetty.http2.server.H2SpecServer</mainClass>
           <skip>${skipTests}</skip>
+          <junitPackage>org.eclipse.jetty.h2spec</junitPackage>
           <excludeSpecs>
-            <!-- see: https://github.com/summerwind/h2spec/issues/115 -->
-            <excludeSpec>6.9.2 - Changes SETTINGS_INITIAL_WINDOW_SIZE after sending HEADERS frame</excludeSpec>
+            <excludeSpec>3.5 - Sends invalid connection preface</excludeSpec>
           </excludeSpecs>
         </configuration>
         <executions>
@@ -93,4 +94,34 @@
     </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>run-spec-server</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>spec-server-run</id>
+                <phase>test</phase>
+                <configuration>
+                  <mainClass>org.eclipse.jetty.http2.server.H2SpecServer</mainClass>
+                  <classpathScope>test</classpathScope>
+                  <arguments>
+                    <argument>${manual.test.port}</argument>
+                  </arguments>
+                </configuration>
+                <goals>
+                  <goal>java</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/pom.xml b/pom.xml
index 86f3285f33b..2c7dcdf42bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -939,9 +939,9 @@
           </configuration>
         </plugin>
         <plugin>
-          <groupId>com.github.madgnome</groupId>
+          <groupId>org.mortbay.jetty</groupId>
           <artifactId>h2spec-maven-plugin</artifactId>
-          <version>0.6</version>
+          <version>1.0.0</version>
         </plugin>
       </plugins>
     </pluginManagement>