diff --git a/pom.xml b/pom.xml
index 77cf071bd8..148dad3ea0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,38 +432,6 @@
       </dependencies>
    </dependencyManagement>
 
-   <repositories>
-      <repository>
-         <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-         </snapshots>
-         <releases>
-            <enabled>true</enabled>
-            <updatePolicy>interval:10080</updatePolicy>
-         </releases>
-         <id>jboss.release</id>
-         <name>JBoss releases</name>
-         <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-      </repository>
-   </repositories>
-   <pluginRepositories>
-      <pluginRepository>
-         <snapshots>
-            <enabled>false</enabled>
-            <updatePolicy>never</updatePolicy>
-         </snapshots>
-         <releases>
-            <enabled>true</enabled>
-            <updatePolicy>interval:10080</updatePolicy>
-         </releases>
-         <id>jboss.release</id>
-         <name>JBoss releases</name>
-         <url>https://repository.jboss.org/nexus/content/groups/public</url>
-      </pluginRepository>
-   </pluginRepositories>
-
-
    <profiles>
       <profile>
          <id>default</id>
diff --git a/tests/byteman-tests/pom.xml b/tests/byteman-tests/pom.xml
index f833e0cf0b..a576f92a54 100644
--- a/tests/byteman-tests/pom.xml
+++ b/tests/byteman-tests/pom.xml
@@ -127,15 +127,7 @@
          <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jboss-security-spi</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jbosssx</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>apache-logging</groupId>
+         <groupId>commons-logging</groupId>
          <artifactId>commons-logging</artifactId>
       </dependency>
       <dependency>
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index a025444e93..bda1855ddd 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -131,14 +131,6 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jboss-security-spi</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jbosssx</artifactId>
-      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index d34a277f24..a86a0ab6fb 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -82,20 +82,12 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jboss-security-spi</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jbosssx</artifactId>
-      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
       </dependency>
       <dependency>
-         <groupId>apache-logging</groupId>
+         <groupId>commons-logging</groupId>
          <artifactId>commons-logging</artifactId>
       </dependency>
       <dependency>
diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml
index 26101c66df..3947fa9a98 100644
--- a/tests/joram-tests/pom.xml
+++ b/tests/joram-tests/pom.xml
@@ -54,20 +54,12 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jboss-security-spi</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jbosssx</artifactId>
-      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
       </dependency>
       <dependency>
-         <groupId>apache-logging</groupId>
+         <groupId>commons-logging</groupId>
          <artifactId>commons-logging</artifactId>
       </dependency>
       <dependency>
diff --git a/tests/pom.xml b/tests/pom.xml
index a6695a3e7a..8b95a9ba16 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -43,21 +43,6 @@
          </dependency>
          <!-- ## End XA Dependencies ## -->
 
-         <!--## Security Dependencies ## -->
-         <dependency>
-            <groupId>org.jboss.security</groupId>
-            <artifactId>jboss-security-spi</artifactId>
-            <version>2.0.3.SP1</version>
-            <!-- License: LGPL -->
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.security</groupId>
-            <artifactId>jbosssx</artifactId>
-            <version>2.0.3.SP1</version>
-            <!-- License: LGPL -->
-         </dependency>
-         <!-- ## End Security Dependencies ## -->
-
          <!--## JMS Dependencies ## -->
          <dependency>
             <groupId>org.apache.geronimo.components</groupId>
@@ -66,9 +51,9 @@
             <!-- License: Apache: 2.0 -->
          </dependency>
          <dependency>
-            <groupId>apache-logging</groupId>
+            <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.0.jboss</version>
+            <version>1.2</version>
             <!-- License: Apache: 2.0 -->
          </dependency>
          <!-- End JMS Dependencies -->
diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml
index 9dcb03d6d1..b85a2c7fd9 100644
--- a/tests/soak-tests/pom.xml
+++ b/tests/soak-tests/pom.xml
@@ -87,20 +87,12 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jboss-security-spi</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jbosssx</artifactId>
-      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
       </dependency>
       <dependency>
-         <groupId>apache-logging</groupId>
+         <groupId>commons-logging</groupId>
          <artifactId>commons-logging</artifactId>
       </dependency>
       <dependency>
diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml
index 9ba2b55727..7a1ba68635 100644
--- a/tests/stress-tests/pom.xml
+++ b/tests/stress-tests/pom.xml
@@ -87,20 +87,12 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jboss-security-spi</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jbosssx</artifactId>
-      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
       </dependency>
       <dependency>
-         <groupId>apache-logging</groupId>
+         <groupId>commons-logging</groupId>
          <artifactId>commons-logging</artifactId>
       </dependency>
       <dependency>
diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml
index 120404fdab..f16c4b1717 100644
--- a/tests/timing-tests/pom.xml
+++ b/tests/timing-tests/pom.xml
@@ -69,14 +69,6 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jboss-security-spi</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jbosssx</artifactId>
-      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 975ea108b1..cc08555cb7 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -70,18 +70,6 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jboss-security-spi</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jbosssx</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.security</groupId>
-         <artifactId>jbosssx</artifactId>
-      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>