diff --git a/dev-python/txAMQP/txAMQP-0.8.2.ebuild b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
index ee0ea7c19f33b..b5cd02193b9a3 100644
--- a/dev-python/txAMQP/txAMQP-0.8.2.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
@@ -57,7 +57,10 @@ src_test() {
 	/usr/libexec/rabbitmq/rabbitmq-server -p 5672:5672 &
 
 	einfo "Waiting for rabbitmq to fully load"
-	sleep 10 # Maybe need to increase timeout
+	while ! { echo >/dev/tcp/localhost/5672 ; } &> /dev/null; do
+		sleep 1
+	done
+	einfo "rabbitmq is ready"
 
 	distutils-r1_src_test