diff --git a/drivers/amazonec2/amazonec2_test.go b/drivers/amazonec2/amazonec2_test.go
index 930e89efc3..5e9e18e762 100644
--- a/drivers/amazonec2/amazonec2_test.go
+++ b/drivers/amazonec2/amazonec2_test.go
@@ -14,6 +14,7 @@ import (
 const (
 	testSSHPort    = 22
 	testDockerPort = 2376
+	testSwarmPort  = 3376
 )
 
 var (
@@ -87,6 +88,29 @@ func TestConfigureSecurityGroupPermissionsDockerAndSsh(t *testing.T) {
 	assert.Empty(t, perms)
 }
 
+func TestConfigureSecurityGroupPermissionsWithSwarm(t *testing.T) {
+	driver := NewTestDriver()
+	driver.SwarmMaster = true
+	group := securityGroup
+	group.IpPermissions = []*ec2.IpPermission{
+		{
+			IpProtocol: aws.String("tcp"),
+			FromPort:   aws.Int64(testSSHPort),
+			ToPort:     aws.Int64(testSSHPort),
+		},
+		{
+			IpProtocol: aws.String("tcp"),
+			FromPort:   aws.Int64(testDockerPort),
+			ToPort:     aws.Int64(testDockerPort),
+		},
+	}
+
+	perms := driver.configureSecurityGroupPermissions(group)
+
+	assert.Len(t, perms, 1)
+	assert.Equal(t, testSwarmPort, *perms[0].FromPort)
+}
+
 func TestValidateAwsRegionValid(t *testing.T) {
 	regions := []string{"eu-west-1", "eu-central-1"}