diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire2006ShadefireTransformersIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire2006ShadefireTransformersIT.java
new file mode 100644
index 0000000000..ca6997eee7
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire2006ShadefireTransformersIT.java
@@ -0,0 +1,42 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+/**
+ * Test for shadefire usage
+ *
+ * @author Slawomir Jaranowski
+ */
+public class Surefire2006ShadefireTransformersIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void shadefireShouldBeUsed()
+ {
+ unpack( "surefire-2006-shadefire-transformers" )
+ .executeTest()
+ .assertTestSuiteResults( 1, 0, 0, 0 )
+ .verifyTextInLog(
+ "[INFO] Using configured provider org.apache.maven.shadefire.surefire.junit.JUnit3Provider" );
+ }
+}
diff --git a/surefire-its/src/test/resources/surefire-2006-shadefire-transformers/pom.xml b/surefire-its/src/test/resources/surefire-2006-shadefire-transformers/pom.xml
new file mode 100644
index 0000000000..68ea2607e4
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-2006-shadefire-transformers/pom.xml
@@ -0,0 +1,54 @@
+
+
+
+
+ 4.0.0
+
+ org.apache.maven.plugins.surefire
+ surefire-2006
+ 1.0-SNAPSHOT
+ shadefire usage test
+
+
+ ${java.specification.version}
+ ${java.specification.version}
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ ${surefire.version}
+
+
+ org.apache.maven.surefire
+ surefire-shadefire
+ ${surefire.version}
+
+
+
+
+
+
diff --git a/surefire-its/src/test/resources/surefire-2006-shadefire-transformers/src/test/java/PojoTest.java b/surefire-its/src/test/resources/surefire-2006-shadefire-transformers/src/test/java/PojoTest.java
new file mode 100644
index 0000000000..1638c64667
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-2006-shadefire-transformers/src/test/java/PojoTest.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class PojoTest
+{
+ public void testSuccess()
+ {
+ assert true;
+ }
+}
diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
index 164e35ccb2..1c8c41213e 100644
--- a/surefire-shadefire/pom.xml
+++ b/surefire-shadefire/pom.xml
@@ -88,9 +88,30 @@
org.apache.maven.shadefire
-
-
-
+
+
+
+ org.apache.maven.surefire:*
+
+ META-INF/services/**
+
+
+
+
+
+ META-INF/services/org.apache.maven.shadefire.surefire.spi.MasterProcessChannelProcessorFactory
+ src/main/resources/META-INF/services/org.apache.maven.shadefire.surefire.spi.MasterProcessChannelProcessorFactory
+
+
+ META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider
+ src/main/resources/META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider
+
+
+
+
+ META-INF/DEPENDENCIES
+
+
diff --git a/surefire-shadefire/src/main/resources/META-INF/services/org.apache.maven.shadefire.surefire.spi.MasterProcessChannelProcessorFactory b/surefire-shadefire/src/main/resources/META-INF/services/org.apache.maven.shadefire.surefire.spi.MasterProcessChannelProcessorFactory
new file mode 100644
index 0000000000..5fe2d23cd5
--- /dev/null
+++ b/surefire-shadefire/src/main/resources/META-INF/services/org.apache.maven.shadefire.surefire.spi.MasterProcessChannelProcessorFactory
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+org.apache.maven.shadefire.surefire.booter.spi.LegacyMasterProcessChannelProcessorFactory
+org.apache.maven.shadefire.surefire.booter.spi.SurefireMasterProcessChannelProcessorFactory
diff --git a/surefire-shadefire/src/main/resources/META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider b/surefire-shadefire/src/main/resources/META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider
new file mode 100644
index 0000000000..1445853c50
--- /dev/null
+++ b/surefire-shadefire/src/main/resources/META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+org.apache.maven.shadefire.surefire.junit.JUnit3Provider