diff --git a/omniqueue/Cargo.toml b/omniqueue/Cargo.toml
index 9c05b09..18c7f82 100644
--- a/omniqueue/Cargo.toml
+++ b/omniqueue/Cargo.toml
@@ -11,8 +11,8 @@ edition = "2021"
 
 [dependencies]
 async-trait = "0.1"
-aws-config = { version = "0.55", optional = true }
-aws-sdk-sqs = { version = "0.25", optional = true }
+aws-config = { version = "1.1.5", features = ["behavior-version-latest"], optional = true }
+aws-sdk-sqs = { version = "1.13.0", optional = true }
 bb8 = { version = "0.8", optional = true }
 bb8-redis = { version = "0.14.0", optional = true }
 futures-util = { version = "0.3.28", default-features = false, features = ["async-await", "std"], optional = true }
diff --git a/omniqueue/src/backends/sqs.rs b/omniqueue/src/backends/sqs.rs
index 0f22155..28c8d15 100644
--- a/omniqueue/src/backends/sqs.rs
+++ b/omniqueue/src/backends/sqs.rs
@@ -268,7 +268,6 @@ impl QueueConsumer for SqsQueueConsumer {
             .map_err(QueueError::generic)?;
 
         out.messages()
-            .unwrap_or_default()
             .iter()
             .map(|message| -> Result<Delivery, QueueError> { Ok(self.wrap_message(message)) })
             .next()
@@ -293,7 +292,6 @@ impl QueueConsumer for SqsQueueConsumer {
             .map_err(QueueError::generic)?;
 
         out.messages()
-            .unwrap_or_default()
             .iter()
             .map(|message| -> Result<Delivery, QueueError> { Ok(self.wrap_message(message)) })
             .collect::<Result<Vec<_>, _>>()
diff --git a/omniqueue/tests/gcp_pubsub.rs b/omniqueue/tests/it/gcp_pubsub.rs
similarity index 99%
rename from omniqueue/tests/gcp_pubsub.rs
rename to omniqueue/tests/it/gcp_pubsub.rs
index b53cf36..51022e9 100644
--- a/omniqueue/tests/gcp_pubsub.rs
+++ b/omniqueue/tests/it/gcp_pubsub.rs
@@ -1,5 +1,3 @@
-#![cfg(feature = "gcp_pubsub")]
-
 //! Support for Google Cloud Pub/Sub.
 //!
 //! In this system subscriptions are like queue bindings to topics.
diff --git a/omniqueue/tests/it/main.rs b/omniqueue/tests/it/main.rs
new file mode 100644
index 0000000..a9c8571
--- /dev/null
+++ b/omniqueue/tests/it/main.rs
@@ -0,0 +1,10 @@
+#[cfg(feature = "gcp_pubsub")]
+mod gcp_pubsub;
+#[cfg(feature = "rabbitmq")]
+mod rabbitmq;
+#[cfg(feature = "redis")]
+mod redis;
+#[cfg(feature = "redis_cluster")]
+mod redis_cluster;
+#[cfg(feature = "sqs")]
+mod sqs;
diff --git a/omniqueue/tests/rabbitmq.rs b/omniqueue/tests/it/rabbitmq.rs
similarity index 99%
rename from omniqueue/tests/rabbitmq.rs
rename to omniqueue/tests/it/rabbitmq.rs
index 4d5315c..d5e44f0 100644
--- a/omniqueue/tests/rabbitmq.rs
+++ b/omniqueue/tests/it/rabbitmq.rs
@@ -1,5 +1,3 @@
-#![cfg(feature = "rabbitmq")]
-
 use lapin::options::ExchangeDeclareOptions;
 use lapin::types::AMQPValue;
 use lapin::{
diff --git a/omniqueue/tests/redis.rs b/omniqueue/tests/it/redis.rs
similarity index 99%
rename from omniqueue/tests/redis.rs
rename to omniqueue/tests/it/redis.rs
index 242bef1..3e2c546 100644
--- a/omniqueue/tests/redis.rs
+++ b/omniqueue/tests/it/redis.rs
@@ -1,5 +1,3 @@
-#![cfg(feature = "redis")]
-
 use omniqueue::{
     backends::redis::{RedisConfig, RedisQueueBackend},
     queue::{consumer::QueueConsumer, producer::QueueProducer, QueueBackend, QueueBuilder, Static},
diff --git a/omniqueue/tests/redis_cluster.rs b/omniqueue/tests/it/redis_cluster.rs
similarity index 99%
rename from omniqueue/tests/redis_cluster.rs
rename to omniqueue/tests/it/redis_cluster.rs
index 8bd26b9..a4c2ecd 100644
--- a/omniqueue/tests/redis_cluster.rs
+++ b/omniqueue/tests/it/redis_cluster.rs
@@ -1,5 +1,3 @@
-#![cfg(feature = "redis_cluster")]
-
 use omniqueue::{
     backends::redis::{RedisClusterQueueBackend, RedisConfig},
     queue::{consumer::QueueConsumer, producer::QueueProducer, QueueBackend, QueueBuilder, Static},
diff --git a/omniqueue/tests/sqs.rs b/omniqueue/tests/it/sqs.rs
similarity index 99%
rename from omniqueue/tests/sqs.rs
rename to omniqueue/tests/it/sqs.rs
index 35cfa4e..54987c0 100644
--- a/omniqueue/tests/sqs.rs
+++ b/omniqueue/tests/it/sqs.rs
@@ -1,5 +1,3 @@
-#![cfg(feature = "sqs")]
-
 use aws_sdk_sqs::Client;
 use omniqueue::{
     backends::sqs::{SqsConfig, SqsQueueBackend},
diff --git a/testing-docker-compose.yml b/testing-docker-compose.yml
index 2d679d5..6cd6c9d 100644
--- a/testing-docker-compose.yml
+++ b/testing-docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - ./_rabbit/plugins:/usr/lib/rabbitmq/plugins
 
   elasticmq: # Drop-in SQS replacement
-    image: docker.io/softwaremill/elasticmq:1.3.14
+    image: docker.io/softwaremill/elasticmq-native:1.5.7
     ports:
       - "9324:9324"
       - "9325:9325"