diff --git a/.github/workflows/kind.yml b/.github/workflows/kind.yml
index 08b434af..f1d6d416 100644
--- a/.github/workflows/kind.yml
+++ b/.github/workflows/kind.yml
@@ -23,10 +23,10 @@ jobs:
     strategy:
       matrix:
         # Run tests on oldest and newest supported OCP Kubernetes
-        # - OCP 4.5 runs Kubernetes v1.18
+        # The "oldest" tag is set in the Makefile
         # KinD tags: https://hub.docker.com/r/kindest/node/tags
         kind:
-          - 'v1.18.15'
+          - 'oldest'
           - 'latest'
     name: KinD tests
     steps:
diff --git a/Makefile b/Makefile
index 9468e498..74230071 100644
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,11 @@ KIND_NAMESPACE ?= open-cluster-management-agent-addon
 KIND_VERSION ?= latest
 MANAGED_CLUSTER_NAME ?= managed
 WATCH_NAMESPACE ?= $(MANAGED_CLUSTER_NAME)
+# Set the Kind version tag
 ifneq ($(KIND_VERSION), latest)
 	KIND_ARGS = --image kindest/node:$(KIND_VERSION)
+else ifneq ($(KIND_VERSION), oldest)
+	KIND_ARGS = --image kindest/node:v1.19.16
 else
 	KIND_ARGS =
 endif