Index: modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml	(revision 17777)
+++ modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml	(working copy)
@@ -59,7 +59,7 @@
           <include name="org/jboss/test/ws/jaxws/samples/mtom/jaxws/*.class"/>
        </classes>
        <zipfileset
-          dir="${tests.output.dir}/test-resources/jaxws/samples/mtom/WEB-INF/wsdl" 
+          dir="${tests.output.dir}/test-resources/jaxws/samples/mtom/WEB-INF/wsdl"
           prefix="WEB-INF/wsdl"/>
     </war>
     <!-- jaxws-samples-schemavalidation -->
@@ -72,7 +72,7 @@
           <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/types/*.class"/>
        </classes>
         <zipfileset
-           dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/WEB-INF/wsdl" 
+           dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/WEB-INF/wsdl"
            prefix="WEB-INF/wsdl"/>
         <manifest>
           <attribute name="Dependencies" value="org.apache.cxf"/>
@@ -96,7 +96,7 @@
         <include name="jaxws-client-config.xml" />
       </metainf>
     </jar>
-  	
+
     <!-- jaxws-samples-wsa -->
     <war
        warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war"
@@ -137,13 +137,13 @@
           <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
        </classes>
        <zipfileset
-          dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" 
+          dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl"
           prefix="WEB-INF/wsdl"/>
        <manifest>
          <attribute name="Dependencies" value="org.apache.cxf"/>
        </manifest>
     </war>
-  	
+
     <!-- jaxws-samples-wsse-policy-oasis-21x -->
     <war
        warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-oasis-21x.war" needxmlfile='false'>
@@ -217,7 +217,7 @@
         <include name="alice.jks" />
       </metainf>
     </jar>
-  	
+
     <!-- jaxws-samples-wsse-policy-secconv -->
     <war
        warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-secconv.war" needxmlfile='false'>
@@ -246,7 +246,7 @@
         <include name="alice.jks" />
       </metainf>
     </jar>
-  	
+
     <!-- jaxws-samples-wsse-policy-sign -->
     <war
        warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign.war"
@@ -322,7 +322,11 @@
     <war
        warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-gcm.war"
        webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml">
+       <lib dir="${tests.output.dir}/bcprov-lib">
+          <include name="*.jar"/>
+       </lib>
        <classes dir="${tests.output.dir}/test-classes">
+          <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/BouncyCastleJCEProviderRegistrator*.class"/>
           <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.class"/>
           <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
           <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.class"/>
@@ -343,7 +347,11 @@
     <!-- jaxws-samples-wsse-policy-sign-encrypt-gcm-code-first -->
     <war
        warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-gcm-code-first.war" needxmlfile='false'>
+       <lib dir="${tests.output.dir}/bcprov-lib">
+          <include name="*.jar"/>
+       </lib>
        <classes dir="${tests.output.dir}/test-classes">
+          <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedBouncyCastleJCEProviderRegistrator*.class"/>
           <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedService*.class"/>
           <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
           <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.class"/>
Index: modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedBouncyCastleJCEProviderRegistrator.java
===================================================================
--- modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedBouncyCastleJCEProviderRegistrator.java	(revision 0)
+++ modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedBouncyCastleJCEProviderRegistrator.java	(working copy)
@@ -0,0 +1,21 @@
+package org.jboss.test.ws.jaxws.samples.wsse.policy.basic;
+
+import java.security.Security;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+@WebServlet(loadOnStartup = 1)
+public class AnnotatedBouncyCastleJCEProviderRegistrator extends HttpServlet {
+
+	private static final long serialVersionUID = -4943740805317142078L;
+
+	@Override
+	public void init(ServletConfig config) throws ServletException {
+		Security.addProvider(new BouncyCastleProvider());
+	}
+}
Index: modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/BouncyCastleJCEProviderRegistrator.java
===================================================================
--- modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/BouncyCastleJCEProviderRegistrator.java	(revision 0)
+++ modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/BouncyCastleJCEProviderRegistrator.java	(working copy)
@@ -0,0 +1,19 @@
+package org.jboss.test.ws.jaxws.samples.wsse.policy.basic;
+
+import java.security.Security;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+public class BouncyCastleJCEProviderRegistrator extends HttpServlet {
+
+	private static final long serialVersionUID = -4943740805317142078L;
+
+	@Override
+	public void init(ServletConfig config) throws ServletException {
+		Security.addProvider(new BouncyCastleProvider());
+	}
+}
Index: modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml
===================================================================
--- modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml	(revision 17777)
+++ modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml	(working copy)
@@ -5,8 +5,14 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
    <servlet>
+      <servlet-name>JCEProviderRegistrator</servlet-name>
+      <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.policy.basic.BouncyCastleJCEProviderRegistrator</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+   <servlet>
       <servlet-name>TestService</servlet-name>
       <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.policy.basic.ServiceImpl</servlet-class>
+      <load-on-startup>1</load-on-startup>
    </servlet>
    <servlet-mapping>
       <servlet-name>TestService</servlet-name>
Index: modules/testsuite/cxf-tests/pom.xml
===================================================================
--- modules/testsuite/cxf-tests/pom.xml	(revision 17765)
+++ modules/testsuite/cxf-tests/pom.xml	(working copy)
@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  
+
   <name>JBoss Web Services - Stack CXF Specific Tests</name>
   <artifactId>jbossws-cxf-specific-tests</artifactId>
   <packaging>jar</packaging>
-  
+
   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
@@ -13,7 +13,7 @@
     <version>4.2.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  
+
   <properties>
     <!-- This is used for test archives embedding Spring and is intentionally different from the
          version specified in the jbossws-cxf main pom.xml to test there're no classloading clashes -->
@@ -22,7 +22,7 @@
          version specified in the jbossws-cxf main pom.xml to test there're no classloading clashes -->
     <test.cxf.version>2.6.6</test.cxf.version>
   </properties>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.jboss.ws.cxf</groupId>
@@ -41,6 +41,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+		<groupId>org.bouncycastle</groupId>
+		<artifactId>bcprov-jdk16</artifactId>
+		<version>1.46</version>
+<!-- 		<version>${org.bouncycastle.version}</version> -->
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>provided</scope>
@@ -49,10 +55,10 @@
 
   <!-- Profiles -->
   <profiles>
-    
-    <!-- 
+
+    <!--
     Name:  noprepare
-    Descr: Skip test preparation with -Dnoprepare  
+    Descr: Skip test preparation with -Dnoprepare
     -->
     <profile>
       <id>noprepare</id>
@@ -74,6 +80,11 @@
                 </goals>
                 <configuration>
                   <target>
+                    <dependencyfilesets prefix="maven_deps."/>
+                    <mkdir dir="${project.build.directory}/bcprov-lib"/>
+                    <copy todir="${project.build.directory}/bcprov-lib">
+                      <fileset refid="maven_deps.org.bouncycastle:bcprov-jdk16:jar"/>
+                    </copy>
                     <property name="tests.output.dir" value="${project.build.directory}"/>
                     <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
                     <ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/>
@@ -214,7 +225,7 @@
         </plugins>
       </build>
     </profile>
-    
+
   </profiles>
-  
+
 </project>