diff --git a/test/elasticsearch/cluster/cluster_test.exs b/test/elasticsearch/cluster/cluster_test.exs
index f06bf74..ca1f9b3 100644
--- a/test/elasticsearch/cluster/cluster_test.exs
+++ b/test/elasticsearch/cluster/cluster_test.exs
@@ -8,10 +8,6 @@ defmodule Elasticsearch.ClusterTest do
       url: "http://localhost:9200",
       username: "username",
       password: "password",
-      aws_access_key_id: "aws_access_key_id",
-      aws_secret_access_key: "aws_secret_access_key",
-      aws_region: "us-east-1",
-      aws_service: "es",
       indexes: %{
         posts: %{
           settings: "test/support/settings/posts.json",
@@ -20,7 +16,15 @@ defmodule Elasticsearch.ClusterTest do
           bulk_page_size: 5000,
           bulk_wait_interval: 5000
         }
-      }
+      },
+      default_options: [
+        aws: [
+          region: "us-east-1",
+          service: "es",
+          access_key: "aws_access_key_id",
+          secret: "aws_secret_access_key"
+        ]
+      ]
     }
   end
 
diff --git a/test/support/cluster.ex b/test/support/cluster.ex
index 6f48716..a1141f9 100644
--- a/test/support/cluster.ex
+++ b/test/support/cluster.ex
@@ -21,13 +21,13 @@ defmodule Elasticsearch.Test.Cluster do
          }
        },
        default_options: [
-        aws: [
-          region: "us-east-1",
-          service: "es",
-          access_key: "aws_access_key_id",
-          secret: "aws_secret_access_key"
-        ]
-      ]
+         aws: [
+           region: "us-east-1",
+           service: "es",
+           access_key: "aws_access_key_id",
+           secret: "aws_secret_access_key"
+         ]
+       ]
      }}
   end
 end