diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml
index 9dec7c4c11..08c0a756e1 100755
--- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml
+++ b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml
@@ -46,7 +46,6 @@
 
 		<!-- These do not natively support OSGi, so using 3rd party bundles. -->
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_5</bundle>
-		<bundle>mvn:org.jboss.javassist/com.springsource.javassist/3.15.0.GA</bundle>
 		<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/2.2.0</bundle>
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.8.2_2</bundle>
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5</bundle>
@@ -57,6 +56,7 @@
         <bundle>wrap:mvn:org.hibernate.common/hibernate-commons-annotations/4.0.2.Final</bundle>
         <bundle>mvn:com.fasterxml/classmate/0.5.4</bundle>
         <bundle>mvn:org.jboss.logging/jboss-logging/3.1.0.GA</bundle>
+		<bundle>mvn:org.javassist/javassist/3.18.0-GA</bundle>
         
         <bundle>mvn:org.hibernate/hibernate-core/4.3.0-SNAPSHOT</bundle>
         <bundle>mvn:org.hibernate/hibernate-entitymanager/4.3.0-SNAPSHOT</bundle>
diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml
index 27d67036be..42b695ac5e 100644
--- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml
+++ b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml
@@ -21,7 +21,6 @@
 
 		<!-- These do not natively support OSGi, so using 3rd party bundles. -->
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_5</bundle>
-		<bundle>mvn:org.jboss.javassist/com.springsource.javassist/3.15.0.GA</bundle>
 		<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/2.2.0</bundle>
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.8.2_2</bundle>
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5</bundle>
@@ -32,6 +31,7 @@
 		
         <bundle>mvn:com.fasterxml/classmate/0.5.4</bundle>
         <bundle>mvn:org.jboss.logging/jboss-logging/3.1.0.GA</bundle>
+		<bundle>mvn:org.javassist/javassist/3.18.0-GA</bundle>
         
         <bundle>mvn:org.hibernate/hibernate-core/4.3.0-SNAPSHOT</bundle>
         <bundle>mvn:org.hibernate/hibernate-entitymanager/4.3.0-SNAPSHOT</bundle>
diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml
index b8efe8e742..abc9ca26b3 100644
--- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml
+++ b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml
@@ -21,7 +21,6 @@
 
 		<!-- These do not natively support OSGi, so using 3rd party bundles. -->
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_5</bundle>
-		<bundle>mvn:org.jboss.javassist/com.springsource.javassist/3.15.0.GA</bundle>
 		<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/2.2.0</bundle>
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.8.2_2</bundle>
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5</bundle>
@@ -38,6 +37,7 @@
 		
         <bundle>mvn:com.fasterxml/classmate/0.5.4</bundle>
         <bundle>mvn:org.jboss.logging/jboss-logging/3.1.0.GA</bundle>
+		<bundle>mvn:org.javassist/javassist/3.18.0-GA</bundle>
         
         <!-- JACC is optional. -->
         <!--<bundle>mvn:javax.servlet/javax.servlet-api/3.0.1</bundle>
diff --git a/hibernate-osgi/hibernate-osgi.gradle b/hibernate-osgi/hibernate-osgi.gradle
index 3b50912446..6c154658d2 100644
--- a/hibernate-osgi/hibernate-osgi.gradle
+++ b/hibernate-osgi/hibernate-osgi.gradle
@@ -92,7 +92,7 @@ task copyBnd(type: Copy) {
 
 task runBnd(type: JavaExec){
 	main = "-jar"
-	args "$buildDir/osgi-lib/bnd/bnd.jar", "$buildDir/osgi-lib/bnd/cdi-api.bnd", "$buildDir/osgi-lib/bnd/el-api.bnd", "$buildDir/osgi-lib/bnd/jandex.bnd", "$buildDir/osgi-lib/bnd/javassist.bnd", "$buildDir/osgi-lib/bnd/serp.bnd"
+	args "$buildDir/osgi-lib/bnd/bnd.jar", "$buildDir/osgi-lib/bnd/cdi-api.bnd", "$buildDir/osgi-lib/bnd/el-api.bnd", "$buildDir/osgi-lib/bnd/jandex.bnd", "$buildDir/osgi-lib/bnd/serp.bnd"
 }
 
 task copyToLib(type: Copy) {
diff --git a/hibernate-osgi/src/test/resources/bnd/javassist.bnd b/hibernate-osgi/src/test/resources/bnd/javassist.bnd
deleted file mode 100644
index f378b24db8..0000000000
--- a/hibernate-osgi/src/test/resources/bnd/javassist.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
- Bundle-SymbolicName: javassist
- Bundle-Version: 3.18.0
-
- Include-Resource: @../javassist-3.18.0-GA.jar
-Import-Package: com.sun.jdi;resolution:=optional,com.sun.jdi.connect;resolution:=optional,com.sun.jdi.event;resolution:=optional,com.sun.jdi.request;resolution:=optional
--exportcontents: javassist,javassist.bytecode,javassist.bytecode.analysis,javassist.bytecode.annotation,javassist.bytecode.stackmap,javassist.compiler,javassist.compiler.ast,javassist.convert,javassist.expr,javassist.runtime,javassist.scopedpool,javassist.tools,javassist.tools.reflect,javassist.tools.rmi,javassist.tools.web,javassist.util,javassist.util.proxy
\ No newline at end of file
diff --git a/hibernate-osgi/src/test/resources/felix-framework.properties b/hibernate-osgi/src/test/resources/felix-framework.properties
index 9d092a261c..dc8974ba17 100644
--- a/hibernate-osgi/src/test/resources/felix-framework.properties
+++ b/hibernate-osgi/src/test/resources/felix-framework.properties
@@ -28,7 +28,7 @@ felix.auto.start.1=\
 	file:target/osgi-lib/bnd/serp-1.14.1.jar \
 	file:target/osgi-lib/h2-1.3.170.jar \
 	file:target/osgi-lib/org.apache.servicemix.bundles.antlr-2.7.7_5.jar \
-	file:target/osgi-lib/bnd/javassist-3.18.0.jar \
+	file:target/osgi-lib/javassist-3.18.1-Beta1.jar \
 	file:target/osgi-lib/org.apache.servicemix.specs.jsr303-api-1.0.0-2.2.0.jar \
 	file:target/osgi-lib/org.apache.servicemix.bundles.ant-1.8.2_2.jar \
 	file:target/osgi-lib/org.apache.servicemix.specs.stax-api-1.2-2.2.0.jar \