@@ -81,7 +81,7 @@ func deleteAllContainers(t assert.TestingT, apiclient client.ContainerAPIClient,

 			Force:         true,

 			RemoveVolumes: true,

 		})

-		if err == nil || client.IsErrNotFound(err) || alreadyExists.MatchString(err.Error()) {

+		if err == nil || client.IsErrNotFound(err) || alreadyExists.MatchString(err.Error()) || isErrNotFoundSwarmClassic(err) {

 			continue

 		}

 		assert.NoError(t, err, "failed to remove %s", container.ID)

@@ -138,6 +138,10 @@ func deleteAllVolumes(t assert.TestingT, c client.VolumeAPIClient, protectedVolu

 			continue

 		}

 		err := c.VolumeRemove(context.Background(), v.Name, true)

+		// Docker EE may list volumes that no longer exist.

+		if isErrNotFoundSwarmClassic(err) {

+			continue

+		}

 		assert.NoError(t, err, "failed to remove volume %s", v.Name)

 	}

 }

@@ -164,6 +168,10 @@ func deleteAllNetworks(t assert.TestingT, c client.NetworkAPIClient, daemonPlatf

 func deleteAllPlugins(t assert.TestingT, c client.PluginAPIClient, protectedPlugins map[string]struct{}) {

 	plugins, err := c.PluginList(context.Background(), filters.Args{})

+	// Docker EE does not allow cluster-wide plugin management.

+	if client.IsErrNotImplemented(err) {

+		return

+	}

 	assert.NoError(t, err, "failed to list plugins")

 	for _, p := range plugins {

@@ -174,3 +182,9 @@ func deleteAllPlugins(t assert.TestingT, c client.PluginAPIClient, protectedPlug

 		assert.NoError(t, err, "failed to remove plugin %s", p.ID)

 	}

 }

+

+// Swarm classic aggregates node errors and returns a 500 so we need to check

+// the error string instead of just IsErrNotFound().

+func isErrNotFoundSwarmClassic(err error) bool {

+	return err != nil && strings.Contains(strings.ToLower(err.Error()), "no such")

+}

@@ -5,6 +5,7 @@ import (

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/filters"

+	dclient "github.com/docker/docker/client"

 	"github.com/docker/docker/integration-cli/fixtures/load"

 	"github.com/stretchr/testify/require"

 )

@@ -172,6 +173,10 @@ func ProtectPlugins(t testingT, testEnv *Execution) {

 func getExistingPlugins(t require.TestingT, testEnv *Execution) []string {

 	client := testEnv.APIClient()

 	pluginList, err := client.PluginList(context.Background(), filters.Args{})

+	// Docker EE does not allow cluster-wide plugin management.

+	if dclient.IsErrNotImplemented(err) {

+		return []string{}

+	}

 	require.NoError(t, err, "failed to list plugins")

 	plugins := []string{}