diff --git a/NOTICE b/NOTICE
index a0d0f9ce47..ef578494eb 100644
--- a/NOTICE
+++ b/NOTICE
@@ -14,11 +14,3 @@ 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.
-
-Certain portions of ActiveMQ are based on code made available
-under the GNU Lesser General Public License, version 2.1 or later
-(http://www.fsf.org/licensing/licenses/lgpl.html).
-"JBoss" and "Red Hat" are trademarks of Red Hat, Inc. and/or its
-affiliates, registered in the U.S. and other countries.  Your
-permissions under the licensing terms governing ActiveMQ do
-not include a license, express or implied, to any Red Hat trademark.
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index bda1855ddd..e246ee4fc9 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -185,6 +185,7 @@
       <dependency>
          <groupId>org.jboss.jbossts.jts</groupId>
          <artifactId>jbossjts-jacorb</artifactId>
+         <version>4.17.13.Final</version>
       </dependency>
       <dependency>
          <groupId>org.jboss</groupId>
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index a86a0ab6fb..c31e32dba1 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -131,6 +131,7 @@
       <dependency>
          <groupId>org.jboss.jbossts.jts</groupId>
          <artifactId>jbossjts-jacorb</artifactId>
+         <version>4.17.13.Final</version>
       </dependency>
    </dependencies>
 
diff --git a/tests/pom.xml b/tests/pom.xml
index 8b95a9ba16..7f4b176fa2 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -34,15 +34,6 @@
 
    <dependencyManagement>
       <dependencies>
-         <!-- ## XA Dependencies ## -->
-         <dependency>
-            <groupId>org.jboss.jbossts.jts</groupId>
-            <artifactId>jbossjts-jacorb</artifactId>
-            <version>4.17.13.Final</version>
-            <!-- License: LGPL -->
-         </dependency>
-         <!-- ## End XA Dependencies ## -->
-
          <!--## JMS Dependencies ## -->
          <dependency>
             <groupId>org.apache.geronimo.components</groupId>
@@ -84,16 +75,24 @@
       </plugins>
    </build>
 
+   <profiles>
+      <profile>
+         <id>banned-tests</id>
+         <modules>
+            <module>jms-tests</module>
+            <module>integration-tests</module>
+            <module>byteman-tests</module>
+            <module>soak-tests</module>
+            <module>stress-tests</module>
+            <module>concurrent-tests</module>
+            <module>performance-tests</module>
+         </modules>
+      </profile>
+   </profiles>
+
    <modules>
       <module>unit-tests</module>
-      <module>jms-tests</module>
       <module>joram-tests</module>
-      <module>soak-tests</module>
-      <module>stress-tests</module>
       <module>timing-tests</module>
-      <module>concurrent-tests</module>
-      <module>performance-tests</module>
-      <module>integration-tests</module>
-      <module>byteman-tests</module>
    </modules>
 </project>