diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java b/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java
index 2b2c1049ba..91f619728c 100755
--- a/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java
@@ -29,7 +29,6 @@ import org.apache.activemq.transport.DefaultTransportListener;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.util.JMSExceptionSupport;
 import org.apache.activemq.util.ServiceSupport;
-import org.axiondb.engine.commands.ShutdownCommand;
 import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
 import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
 
@@ -75,7 +74,7 @@ public class StubConnection implements Service {
         transport.setTransportListener(new DefaultTransportListener() {
             public void onCommand(Command command) {
                 try {
-                    if (command.getClass() == ShutdownCommand.class) {
+                    if (command.getClass() == ShutdownInfo.class) {
                         shuttingDown = true;
                     }
                     StubConnection.this.dispatch(command);
diff --git a/activemq-optional/project.xml b/activemq-optional/project.xml
index bd27593701..7da0dde30e 100755
--- a/activemq-optional/project.xml
+++ b/activemq-optional/project.xml
@@ -192,15 +192,9 @@
       </includes>
       <excludes>
 
-        <!-- http://jira.activemq.org/jira/browse/AMQ-628 -->
-        <exclude>**/HttpTransportBrokerTest.*</exclude>
-
         <!-- http://jira.activemq.org/jira/browse/AMQ-629 -->
         <exclude>**/SslTransportBrokerTest.*</exclude>
 
-        <!-- http://jira.activemq.org/jira/browse/AMQ-631 -->
-        <exclude>**/HttpsTransportBrokerTest.*</exclude>
-
       </excludes>
     </unitTest>
 
diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java
index a0b04c951e..2ba65a2909 100755
--- a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java
+++ b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java
@@ -100,7 +100,7 @@ public class HttpTransport extends HttpTransportSupport {
             }
             catch (Exception e) {
                 if (!isStopped()) {
-                    log.warn("Failed to perform GET on: " + remoteUrl + " due to: " + e, e);
+                    log.error("Failed to perform GET on: " + remoteUrl + " due to: " + e, e);
                 }
                 else {
                     log.trace("Caught error after closed: " + e, e);