diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3402f7fa8c..b0061e21d1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -105,9 +105,12 @@ jobs:
       - name: Start emulated services
         run: docker-compose up -d
 
-      - name: Run tests
+      - name: Run tests with default ssl
         run: |
           cargo test --features integration_test,azure,s3,gcs,datafusion-ext
+      - name: Run tests with rustls
+        run: |
+          cargo test --features integration_test,s3-rustls,datafusion-ext
 
   paruqet2_test:
     runs-on: ubuntu-latest
diff --git a/aws/delta-checkpoint/Cargo.toml b/aws/delta-checkpoint/Cargo.toml
index 891f0c0a77..b275192681 100644
--- a/aws/delta-checkpoint/Cargo.toml
+++ b/aws/delta-checkpoint/Cargo.toml
@@ -23,12 +23,12 @@ tokio-stream = { version = "0", features = ["fs"] }
 [dependencies.deltalake]
 path = "../../rust"
 version = "0"
-features = ["s3"]
+features = ["s3-rustls"]
 
 [dev-dependencies]
-rusoto_core = "0.48"
+rusoto_core = { version = "0.48", default-features = false, features = ["rustls"] }
 rusoto_credential = "0.48"
-rusoto_s3 = "0.48"
+rusoto_s3 = { version = "0.48", default-features = false, features = ["rustls"] }
 
 [[bin]]
 name = "bootstrap"
diff --git a/rust/tests/integration_commit.rs b/rust/tests/integration_commit.rs
index ba6b69d019..9a1c3a8c81 100644
--- a/rust/tests/integration_commit.rs
+++ b/rust/tests/integration_commit.rs
@@ -10,30 +10,31 @@ use std::collections::HashMap;
 
 #[tokio::test]
 #[serial]
-async fn test_commit_tables_local() -> TestResult {
-    Ok(commit_tables(StorageIntegration::Local).await?)
+async fn test_commit_tables_local() {
+    commit_tables(StorageIntegration::Local).await.unwrap();
 }
 
-#[cfg(any(feature = "s3", feature = "s3-rustls"))]
+// rustls doesn't support http scheme, so we are skipping the test when s3-rustls is enabled.
+#[cfg(feature = "s3")]
 #[tokio::test]
 #[serial]
-async fn test_commit_tables_aws() -> TestResult {
+async fn test_commit_tables_aws() {
     std::env::set_var("AWS_S3_LOCKING_PROVIDER", "dynamodb");
-    Ok(commit_tables(StorageIntegration::Amazon).await?)
+    commit_tables(StorageIntegration::Amazon).await.unwrap();
 }
 
 #[cfg(feature = "azure")]
 #[tokio::test]
 #[serial]
-async fn test_commit_tables_azure() -> TestResult {
-    Ok(commit_tables(StorageIntegration::Microsoft).await?)
+async fn test_commit_tables_azure() {
+    commit_tables(StorageIntegration::Microsoft).await.unwrap();
 }
 
 #[cfg(feature = "gcs")]
 #[tokio::test]
 #[serial]
-async fn test_commit_tables_gcp() -> TestResult {
-    Ok(commit_tables(StorageIntegration::Google).await?)
+async fn test_commit_tables_gcp() {
+    commit_tables(StorageIntegration::Google).await.unwrap();
 }
 
 #[cfg(any(feature = "s3", feature = "s3-rustls"))]
diff --git a/rust/tests/integration_concurrent_writes.rs b/rust/tests/integration_concurrent_writes.rs
index de5c5375fc..d13f7d1d9b 100644
--- a/rust/tests/integration_concurrent_writes.rs
+++ b/rust/tests/integration_concurrent_writes.rs
@@ -15,7 +15,8 @@ async fn test_concurrent_writes_local() -> TestResult {
     Ok(())
 }
 
-#[cfg(any(feature = "s3", feature = "s3-rustls"))]
+// rustls doesn't support http scheme, so we are skipping the test when s3-rustls is enabled.
+#[cfg(feature = "s3")]
 #[tokio::test]
 async fn concurrent_writes_s3() -> TestResult {
     test_concurrent_writes(StorageIntegration::Amazon).await?;