diff --git a/kola/tests/misc/grub.go b/kola/tests/misc/grub.go
deleted file mode 100644
index 0c2919923..000000000
--- a/kola/tests/misc/grub.go
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright 2018 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package misc
-
-import (
-	"bytes"
-	"compress/gzip"
-	"crypto/sha512"
-	"encoding/hex"
-	"io/ioutil"
-
-	"github.com/coreos/go-semver/semver"
-
-	"github.com/flatcar/mantle/kola/cluster"
-	"github.com/flatcar/mantle/kola/register"
-	"github.com/flatcar/mantle/platform/conf"
-)
-
-type offsetValue struct {
-	offset  int
-	value   []byte
-	newHash string
-}
-
-var (
-	grubUpdates = map[string]offsetValue{
-		"1e11052c144ae483cba4f70efe278070c50daa80d1a5febe7c0d08e401baf0ab16a542b7a34da00d7aea1591238f01d9902ac6fbfcce8d82eebcf09d97d132cd": {3378, []byte{0x74, 2, 0, 0},
-			"3e9cc58b60301637e37e504c6555f5758c79e3c5493478601ca3c77cc4b6186aa9d732de268a6feb7fcbb88190b46d186b3e3d2dec2ac418645dc1b86a026c0d"},
-		"2fd5f0fade7c4c986259524f148f79ee1d1353d7ab83d1bdd0d50e52d393d8d896c32ab64eb714ba08861b8ba4f113d19f940a04889fa407784f010f119c8c19": {3378, []byte{0x88, 2, 0, 0},
-			"5ce27d73800d4075e4fc48928d7caa11d070b50c4ff056fc56fa93102878cecafa68513a22b71c8e68c749f277d9004bb9e0b1d3394cdb78ea2383b0658e4a28"},
-		"3c591be75a6aa903ee8deed5f8116e627f53738eb8a2ceb80aeaab08f485b405b87565148e482a7234138302eb900786d0e14939a3c3451d424052ca2bd73181": {3383, []byte{0x74, 2, 0, 0},
-			"0a385b66953fe4125ba3e8761a718ce3874c7d63363c0f74c09f897af8971bdd67633921c11bf65d2c7e19346b176e6493726e58ad54b64d4c336529c6a34497"},
-		"6d60e369c1b4b484c7221e91d80f03a782b5286137f8087b2bf22b9f54e3507c4947d2a456ba46a6ef3c0c7216dc8251c017e9122f44cba89e32f23a0542afd3": {3383, []byte{0x74, 2, 0, 0},
-			"a70eb783b1f9d1b8d97dcee3f98787a57a9f49ceffa02abe7ab3ca296824f2f8b0db8f8646130a328ad5e2f11d5dd061e5a0d85d8390f722b5d573c62a1307b0"},
-		"6e9e5ebb6cd1a15d5a570d9a06a56c9bf60cb047d858c7220dd9dcfd54ebb87c8e0ea4611ac98a0ab51fec9e87b265b2207973f3e4882d87f62d887da72f87ab": {3404, []byte{0x88, 2, 0, 0},
-			"937e579767de1f9a7869fbe9b25e296349c4ad51dda30bfd98932e450ee52854a9019eeb75dea2a1f0eff6ba9f06bec794ff05c9e738c2ffd7d5f0eaa751eb9c"},
-		"82b37fa4b305cab33277d2cf0249008731a69575b5689a47e72fe2a35be4440e0e116bc02191f9b0066ea3ae278327fe3409f28d25d13bae88c5f347dba6a254": {3383, []byte{0x74, 2, 0, 0},
-			"a272cf4995e6406f3652be38aa8b971b928427bbe855f266585ddfe4e9c6e79c926a1665d1ec26ac83a0cefafc9f7c0fadbb433ed8748493df14b37174dde37b"},
-		"8a7b03d92a8b115943e7f004820fadd2dc6ab125c077a48fb232a1e9ac77fdb27fbb01d52fd33a6ddf65a9f58ce981244c99bcca821030511caa277bc2f68239": {3378, []byte{0x74, 2, 0, 0},
-			"e61536f2e47d95cc98cb37e955c8cb4b1afaa67f4705868e9f0f5f657370d2a01ea7cfe2733e0d7f0295e18282e24090f82fbbfa88abf6400f53ba476a567bdd"},
-		"a3e9dadfe3cc34189b5fee83bfc01c3c5b42e04ba19cdcd84f8301c42566617b5916294e2414348139d8c5e557a7ccf6c0d3dca0661f2d10c0c0077345630b1d": {3298, []byte{0x74, 2, 0, 0},
-			"c9be6791c064167d2b43ac71c2035a7501542901e0f1a4050466b016d2b85ea46da5780e5b9b61bb26e44ccb39e58fa461d1d9cc3ffb5be26aa35458adff542b"},
-		"c127d7c1dbd5d11cf7af627e37808ea16166b6430ddd8e96111e503cc78ae1fd78083d474495951743fa1b489140be63178a4bb65dabb0d719c5d0ad9c57eb78": {3298, []byte{0x74, 2, 0, 0},
-			"d7c74e09f7030ebcdcb0c4b5e99cb33fbab1138dd552ee194eb79f71cf5252ef4e169a366a160301fcf6a4e8265912c4b334019e47b74c7b2126a605a910eb6f"},
-		"f1f9abefa49eeba6a3fe46ba3d254dfc3fa6e2cd8823835e2d982e9cbcd0d82c298e3896dc79d234305d2262a828a7398526906022f8ed7407368725d95e08d8": {3375, []byte{0x74, 2, 0, 0},
-			"daf12ef71b17d7ddc8fb8419b19bbe2ffb61be9b5bd0d1ca320ac8a07fbfe49924a4b1167bd356d96218972b90b936ce0e508d3b08d470945866aa0c7e71510d"},
-	}
-	grubUpdaterConf = conf.CloudConfig(`write_files:
-    - path: /opt/patch.sh
-      permissions: 0777
-      content: |
-        set -e
-        
-        function patch_grub {
-        	# See bug #2400
-        	local file='/boot/flatcar/grub/i386-pc/linux'
-        	local tmpfile="$(mktemp)"
-        	local escape_hatch='/boot/flatcar/grub/skip-bug-2400-patch'
-        	
-        	[[ -e "${escape_hatch}" ]] && return
-        	[[ ! -e "${file}.mod" ]] && return
-        	
-        	# Avoid writing to /boot if we don't need to
-        	gunzip -c -S .mod "${file}.mod" > "${tmpfile}"
-        	
-        	# Values derived from https://gist.github.com/ajeddeloh/365cfed1d3a326362e05f78720baf4df
-        	declare -A offsets
-        	offsets=(
-        	[1e11052c144ae483cba4f70efe278070c50daa80d1a5febe7c0d08e401baf0ab16a542b7a34da00d7aea1591238f01d9902ac6fbfcce8d82eebcf09d97d132cd]='3378'
-        	[2fd5f0fade7c4c986259524f148f79ee1d1353d7ab83d1bdd0d50e52d393d8d896c32ab64eb714ba08861b8ba4f113d19f940a04889fa407784f010f119c8c19]='3378'
-        	[3c591be75a6aa903ee8deed5f8116e627f53738eb8a2ceb80aeaab08f485b405b87565148e482a7234138302eb900786d0e14939a3c3451d424052ca2bd73181]='3383'
-        	[6d60e369c1b4b484c7221e91d80f03a782b5286137f8087b2bf22b9f54e3507c4947d2a456ba46a6ef3c0c7216dc8251c017e9122f44cba89e32f23a0542afd3]='3383'
-        	[6e9e5ebb6cd1a15d5a570d9a06a56c9bf60cb047d858c7220dd9dcfd54ebb87c8e0ea4611ac98a0ab51fec9e87b265b2207973f3e4882d87f62d887da72f87ab]='3404'
-        	[82b37fa4b305cab33277d2cf0249008731a69575b5689a47e72fe2a35be4440e0e116bc02191f9b0066ea3ae278327fe3409f28d25d13bae88c5f347dba6a254]='3383'
-        	[8a7b03d92a8b115943e7f004820fadd2dc6ab125c077a48fb232a1e9ac77fdb27fbb01d52fd33a6ddf65a9f58ce981244c99bcca821030511caa277bc2f68239]='3378'
-        	[a3e9dadfe3cc34189b5fee83bfc01c3c5b42e04ba19cdcd84f8301c42566617b5916294e2414348139d8c5e557a7ccf6c0d3dca0661f2d10c0c0077345630b1d]='3298'
-        	[c127d7c1dbd5d11cf7af627e37808ea16166b6430ddd8e96111e503cc78ae1fd78083d474495951743fa1b489140be63178a4bb65dabb0d719c5d0ad9c57eb78]='3298'
-        	[f1f9abefa49eeba6a3fe46ba3d254dfc3fa6e2cd8823835e2d982e9cbcd0d82c298e3896dc79d234305d2262a828a7398526906022f8ed7407368725d95e08d8]='3375'
-        	)
-        	
-        	declare -A correctvals
-        	correctvals=(
-        	[1e11052c144ae483cba4f70efe278070c50daa80d1a5febe7c0d08e401baf0ab16a542b7a34da00d7aea1591238f01d9902ac6fbfcce8d82eebcf09d97d132cd]='\x74\x02\x00\x00'
-        	[2fd5f0fade7c4c986259524f148f79ee1d1353d7ab83d1bdd0d50e52d393d8d896c32ab64eb714ba08861b8ba4f113d19f940a04889fa407784f010f119c8c19]='\x88\x02\x00\x00'
-        	[3c591be75a6aa903ee8deed5f8116e627f53738eb8a2ceb80aeaab08f485b405b87565148e482a7234138302eb900786d0e14939a3c3451d424052ca2bd73181]='\x74\x02\x00\x00'
-        	[6d60e369c1b4b484c7221e91d80f03a782b5286137f8087b2bf22b9f54e3507c4947d2a456ba46a6ef3c0c7216dc8251c017e9122f44cba89e32f23a0542afd3]='\x74\x02\x00\x00'
-        	[6e9e5ebb6cd1a15d5a570d9a06a56c9bf60cb047d858c7220dd9dcfd54ebb87c8e0ea4611ac98a0ab51fec9e87b265b2207973f3e4882d87f62d887da72f87ab]='\x88\x02\x00\x00'
-        	[82b37fa4b305cab33277d2cf0249008731a69575b5689a47e72fe2a35be4440e0e116bc02191f9b0066ea3ae278327fe3409f28d25d13bae88c5f347dba6a254]='\x74\x02\x00\x00'
-        	[8a7b03d92a8b115943e7f004820fadd2dc6ab125c077a48fb232a1e9ac77fdb27fbb01d52fd33a6ddf65a9f58ce981244c99bcca821030511caa277bc2f68239]='\x74\x02\x00\x00'
-        	[a3e9dadfe3cc34189b5fee83bfc01c3c5b42e04ba19cdcd84f8301c42566617b5916294e2414348139d8c5e557a7ccf6c0d3dca0661f2d10c0c0077345630b1d]='\x74\x02\x00\x00'
-        	[c127d7c1dbd5d11cf7af627e37808ea16166b6430ddd8e96111e503cc78ae1fd78083d474495951743fa1b489140be63178a4bb65dabb0d719c5d0ad9c57eb78]='\x74\x02\x00\x00'
-        	[f1f9abefa49eeba6a3fe46ba3d254dfc3fa6e2cd8823835e2d982e9cbcd0d82c298e3896dc79d234305d2262a828a7398526906022f8ed7407368725d95e08d8]='\x74\x02\x00\x00'
-        	)
-        	
-        	filesum="$(sha512sum "${tmpfile}" | cut -d' ' -f1)"
-        	if [[ -z "${offsets[$filesum]}" ]]; then
-        		echo "Nothing to do"
-        		rm "${tmpfile}"
-        		touch "${escape_hatch}"
-        		return
-        	fi
-        	
-        	printf "${correctvals[$filesum]}" | dd of="${tmpfile}" bs=1 seek="${offsets[$filesum]}" conv=notrunc status=none
-        	
-        	# There's a lot of sync'ing going on. On remotely up to date systems (newer than 1109.1.0), sync can operate on
-        	# individual files. On old systems it syncs everything which is slow, but we want to be as safe as possible.
-        	# Since we write out the escape hatch after everything is done, this will only happen once.
-        
-        	# rezip onto /boot so ENOSPC can't cause problems
-        	gzip -c "${tmpfile}" > "${file}.tmp"
-        	rm "${tmpfile}"
-        	
-        	# in case something goes horribly wrong. Do not use mv -b since it moves the original file to
-        	# the backup name then moves the new file to the target, leaving a window with no file
-        	cp -p "${file}.mod" "${file}.bak.bug2400"
-        	sync "${file}.bak.bug2400" "${file}.tmp"
-        
-        	# use mv then sync to be as atomic as possible
-        	mv "${file}.tmp" "${file}.mod"
-        	sync '/boot/flatcar/grub/i386-pc/'
-        
-        	touch "${escape_hatch}"
-        
-        	echo 'linux.mod updated successfully'
-        }
-        
-        patch_grub
-
-coreos:
-  units:
-    - name: stop-and-mask-update-engine.service
-      enabled: true
-      contents: |
-        [Unit]
-        Description=Stop Update Engine
-        Conflicts=update-engine.service
-        Before=update-engine.service
-
-        [Service]
-        Type=oneshot
-        RemainAfterExit=true
-        ExecStart=/usr/bin/systemctl mask --now update-engine.service
-
-        [Install]
-        WantedBy=multi-user.target
-`)
-)
-
-func init() {
-	register.Register(&register.Test{
-		Run:           UpdateGrubNop,
-		ClusterSize:   1,
-		Name:          "cl.update.grubnop",
-		UserData:      grubUpdaterConf,
-		MinVersion:    semver.Version{Major: 1745},
-		Architectures: []string{"amd64"},
-		Distros:       []string{"cl"},
-		// This test is normally not related to the cloud environment
-		Platforms:        []string{"qemu"},
-		ExcludePlatforms: []string{"qemu-unpriv"},
-	})
-}
-
-func gunzipAndRead(comp []byte) ([]byte, error) {
-	fh := bytes.NewReader(comp)
-
-	uncomp, err := gzip.NewReader(fh)
-	if err != nil {
-		return nil, err
-	}
-	return ioutil.ReadAll(uncomp)
-}
-
-func UpdateGrubNop(c cluster.TestCluster) {
-	m := c.Machines()[0]
-	originalBytes, err := gunzipAndRead(c.MustSSH(m, "cat /boot/flatcar/grub/i386-pc/linux.mod"))
-	if err != nil {
-		c.Fatalf("failed decompressing: %v", err)
-	}
-	sumAr := sha512.Sum512(originalBytes)
-	sum := hex.EncodeToString(sumAr[:])
-	_, ok := grubUpdates[sum]
-	if ok {
-		c.Fatalf("Found bad linux.mod")
-	}
-
-	if msg := string(c.MustSSH(m, "sudo /opt/patch.sh")); msg != "Nothing to do" {
-		c.Fatalf("Unexpected output %v", msg)
-	}
-	if msg := string(c.MustSSH(m, "sudo /opt/patch.sh")); msg != "" {
-		c.Fatalf("Unexpected output %v", msg)
-	}
-}