diff --git a/tests/aws/requests/sts/get_federation_token_tests.rb b/tests/aws/requests/sts/get_federation_token_tests.rb
new file mode 100644
index 000000000..758f2ab9e
--- /dev/null
+++ b/tests/aws/requests/sts/get_federation_token_tests.rb
@@ -0,0 +1,21 @@
+Shindo.tests('AWS::STS | session tokens', ['aws']) do
+
+	@policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]}
+
+	@federation_format = {
+		'SessionToken' => String,
+		'SecretAccessKey' => String,
+		'Expiration' => String,
+		'AccessKeyId' => String,
+		'Arn' => String,
+		'FederatedUserId' => String,
+		'PackedPolicySize' => String,
+		'RequestId'	=> String
+	}
+
+	tests("#get_federation_token('test@fog.io', #{@policy.inspect})").formats(@federation_format) do
+		pending if Fog.mocking?
+		Fog::AWS[:sts].get_federation_token("test@fog.io", @policy).body
+	end
+	
+end
diff --git a/tests/aws/requests/sts/session_token_tests.rb b/tests/aws/requests/sts/session_token_tests.rb
index 01b5fec57..ff52b8bb3 100644
--- a/tests/aws/requests/sts/session_token_tests.rb
+++ b/tests/aws/requests/sts/session_token_tests.rb
@@ -13,22 +13,4 @@ Shindo.tests('AWS::STS | session tokens', ['aws']) do
 		Fog::AWS[:sts].get_session_token.body
 	end
 	
-	@policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]}
-
-	@federation_format = {
-		'SessionToken' => String,
-		'SecretAccessKey' => String,
-		'Expiration' => String,
-		'AccessKeyId' => String,
-		'Arn' => String,
-		'FederatedUserId' => String,
-		'PackedPolicySize' => String,
-		'RequestId'	=> String
-	}
-
-	tests("#get_federation_token('test@fog.io', #{@policy.inspect})").formats(@federation_format) do
-		pending if Fog.mocking?
-		Fog::AWS[:sts].get_federation_token("test@fog.io", @policy).body
-	end
-	
 end