diff --git a/src/amqp_frame.cpp b/src/amqp_frame.cpp
index 1b5e03c..b2693f4 100644
--- a/src/amqp_frame.cpp
+++ b/src/amqp_frame.cpp
@@ -57,6 +57,7 @@ void Base::writeHeader(QDataStream &stream) const
 void Base::writeEnd(QDataStream &stream) const
 {
     stream << qint8(FRAME_END);
+    stream.device()->waitForBytesWritten(1000);
 }
 
 void Base::writePayload(QDataStream &stream) const
diff --git a/tests/auto/qamqpexchange/tst_qamqpexchange.cpp b/tests/auto/qamqpexchange/tst_qamqpexchange.cpp
index 30743d4..54fa3b1 100644
--- a/tests/auto/qamqpexchange/tst_qamqpexchange.cpp
+++ b/tests/auto/qamqpexchange/tst_qamqpexchange.cpp
@@ -112,6 +112,7 @@ void tst_QAMQPExchange::invalidRedeclaration()
 
     // this is per spec:
     // QCOMPARE(redeclared->error(), QAMQP::NotAllowedError);
+
     // this is for rabbitmq:
     QCOMPARE(redeclared->error(), QAMQP::PreconditionFailedError);
 
diff --git a/tests/auto/qamqpqueue/tst_qamqpqueue.cpp b/tests/auto/qamqpqueue/tst_qamqpqueue.cpp
index 150518d..805cfac 100644
--- a/tests/auto/qamqpqueue/tst_qamqpqueue.cpp
+++ b/tests/auto/qamqpqueue/tst_qamqpqueue.cpp
@@ -367,9 +367,6 @@ void tst_QAMQPQueue::get()
         defaultExchange->publish(expected, "test-get");
     }
 
-    // wait for messages to be delivered
-    QTest::qWait(25);
-
     for (int i = 0; i < messageCount; ++i) {
         QString expected = QString("message %1").arg(i);
         queue->get(false);
@@ -448,8 +445,6 @@ void tst_QAMQPQueue::qos()
         defaultExchange->publish(message, "test-qos");
     }
 
-    QTest::qWait(100);
-
     // begin consuming, one at a time
     QVERIFY(queue->consume());
     QVERIFY(waitForSignal(queue, SIGNAL(consuming(QString))));