diff --git a/kola/tests/docker/docker.go b/kola/tests/docker/docker.go
index 51a664e9e..020564dd8 100644
--- a/kola/tests/docker/docker.go
+++ b/kola/tests/docker/docker.go
@@ -26,6 +26,7 @@ import (
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/net/context"
 
+	"github.com/coreos/go-semver/semver"
 	"github.com/coreos/mantle/kola/cluster"
 	"github.com/coreos/mantle/kola/register"
 	"github.com/coreos/mantle/lang/worker"
@@ -76,6 +77,8 @@ func init() {
 		Name:          "docker.oldclient",
 		Architectures: []string{"amd64"},
 		Distros:       []string{"cl"},
+		// incompatible with docker >=20.10
+		EndVersion: semver.Version{Major: 2956},
 	})
 	register.Register(&register.Test{
 		Run:         dockerUserns,
diff --git a/kola/tests/kubernetes/basic.go b/kola/tests/kubernetes/basic.go
index d4b65f04d..4cfbcff0b 100644
--- a/kola/tests/kubernetes/basic.go
+++ b/kola/tests/kubernetes/basic.go
@@ -21,6 +21,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/coreos/go-semver/semver"
 	"github.com/coreos/mantle/kola/cluster"
 	"github.com/coreos/mantle/kola/register"
 	"github.com/coreos/mantle/platform"
@@ -54,6 +55,8 @@ func init() {
 				ClusterSize: 0,
 				Platforms:   []string{"gce", "do", "aws", "qemu", "azure"}, // TODO: fix packet, esx
 				Distros:     []string{"cl"},
+				// incompatible with docker >=20.10
+				EndVersion: semver.Version{Major: 2956},
 			})
 		}
 	}