diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsTest.java
index 4e32ee34d1..2874ad7221 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsTest.java
@@ -52,21 +52,17 @@ public class JoramJmsTest extends TestCase {
         TestSuite suite = new TestSuite();
 
         // TODO: Fix these tests..
-        if (true) {
+        if (false) {
             // Fails due to https://issues.apache.org/jira/browse/QPID-4454
             suite.addTestSuite(MessageHeaderTest.class);
-            // Fails due to https://issues.apache.org/jira/browse/QPID-4455
+            // https://issues.apache.org/jira/browse/PROTON-154
+            suite.addTestSuite(TopicSessionTest.class);
+        }
+
+        // TODO: enable once QPID 0.20 is released
+        if(false) {
             suite.addTestSuite(QueueBrowserTest.class);
-        }
-
-        // TODO: enable once QPID 0.21 is released
-        if(true) {
             suite.addTestSuite(MessageTypeTest.class);
-        }
-
-        suite.addTestSuite(TopicSessionTest.class);
-        // TODO: enable once QPID 0.19 is released
-        if(true) {
             suite.addTestSuite(UnifiedSessionTest.class);
             suite.addTestSuite(TemporaryTopicTest.class);
             suite.addTestSuite(TopicConnectionTest.class);
diff --git a/pom.xml b/pom.xml
index 7f3c052865..119db791b9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
     <org.osgi.core-version>4.2.0</org.osgi.core-version>
     <p2psockets-version>1.1.2</p2psockets-version>
     <qpid-proton-version>1.0-SNAPSHOT</qpid-proton-version>
-    <qpid-jms-version>0.21-SNAPSHOT</qpid-jms-version>
+    <qpid-jms-version>0.18</qpid-jms-version>
     <regexp-version>1.3</regexp-version>
     <rome-version>1.0</rome-version>
     <saxon-version>9.4</saxon-version>