diff --git a/tests/integration/cri-containerd/integration-tests.sh b/tests/integration/cri-containerd/integration-tests.sh
index 7ebe44197e..7a144cea34 100755
--- a/tests/integration/cri-containerd/integration-tests.sh
+++ b/tests/integration/cri-containerd/integration-tests.sh
@@ -113,7 +113,7 @@ function create_containerd_config() {
 	fi
 
 	# check containerd config version
-	if containerd config default | grep -q "version = 3\>"; then
+	if containerd config default | grep -qE "^version = [34]"; then
 		pluginid=\"io.containerd.cri.v1.runtime\"
 	else
 		pluginid="cri"
@@ -670,6 +670,8 @@ function main() {
 
 	pushd "containerd"
 
+	export_go_toolchain_for_containerd_source_builds
+
 	# Make sure the right artifacts are going to be built
 	sudo make clean