diff --git a/README.md b/README.md
index 0ba641098..10cc48bd1 100644
--- a/README.md
+++ b/README.md
@@ -47,14 +47,14 @@ Build requirements from source:
 Once you have built the tool, use
 
 ```
-moby build linuxkit.yml
+linuxkit build linuxkit.yml
 ```
-to build the example configuration. You can also specify different output formats, eg `moby build -format raw-bios linuxkit.yml` to
-output a raw BIOS bootable disk image, or `moby build -format iso-efi linuxkit.yml` to output an EFI bootable ISO image. See `moby build -help` for more information.
+to build the example configuration. You can also specify different output formats, eg `linuxkit build -format raw-bios linuxkit.yml` to
+output a raw BIOS bootable disk image, or `linuxkit build -format iso-efi linuxkit.yml` to output an EFI bootable ISO image. See `linuxkit build -help` for more information.
 
 ### Booting and Testing
 
-You can use `linuxkit run <name>` or `linuxkit run <name>.<format>` to execute the image you created with `moby build <name>.yml`.
+You can use `linuxkit run <name>` or `linuxkit run <name>.<format>` to execute the image you created with `linuxkit build <name>.yml`.
 This will use a suitable backend for your platform or you can choose one, for example VMWare.
 See `linuxkit run --help`.
 
@@ -105,11 +105,11 @@ rtf -x run linuxkit.examples
 
 ## Building your own customised image
 
-To customise, copy or modify the [`linuxkit.yml`](linuxkit.yml) to your own `file.yml` or use one of the [examples](examples/) and then run `moby build file.yml` to
+To customise, copy or modify the [`linuxkit.yml`](linuxkit.yml) to your own `file.yml` or use one of the [examples](examples/) and then run `linuxkit build file.yml` to
 generate its specified output. You can run the output with `linuxkit run file`.
 
 The yaml file specifies a kernel and base init system, a set of containers that are built into the generated image and started at boot time. You can specify the type
-of artifact to build with the `moby` tool eg `moby build -format vhd linuxkit.yml`.
+of artifact to build with the `moby` tool eg `linuxkit build -format vhd linuxkit.yml`.
 
 If you want to build your own packages, see this [document](docs/packages.md).
 
diff --git a/blueprints/README.md b/blueprints/README.md
index 7c2a4ca1d..0745ac620 100644
--- a/blueprints/README.md
+++ b/blueprints/README.md
@@ -27,7 +27,7 @@ An initial blueprint for the open source components of Docker for Mac is availab
 To build it with the latest Docker CE:
 
 ```
-$ moby build -name docker-for-mac base.yml docker-ce.yml
+$ linuxkit build -name docker-for-mac base.yml docker-ce.yml
 ```
 
 To run the VM with a 4G disk:
diff --git a/docs/platform-aws.md b/docs/platform-aws.md
index 03e88a776..0377f8db4 100644
--- a/docs/platform-aws.md
+++ b/docs/platform-aws.md
@@ -22,7 +22,7 @@ export AWS_REGION=eu-west-1
 AWS requires a `RAW` image. To create one:
 
 ```
-$ moby build -format aws examples/aws.yml
+$ linuxkit build -format aws examples/aws.yml
 ```
 
 ## Push image
diff --git a/docs/platform-azure.md b/docs/platform-azure.md
index 4b0b4a579..41907f260 100644
--- a/docs/platform-azure.md
+++ b/docs/platform-azure.md
@@ -2,7 +2,7 @@
 
 This is a quick guide to running VMs based on LinuxKit images on Azure. Please note that these images currently do not include the [Azure Linux Agent](https://github.com/Azure/WALinuxAgent). As a result, after creating the VM, the portal will report that the creation failed. If you created the VHD properly, you will still be able to SSH into the machine.
 
-When running `linuxkit run azure`, the image you created using `moby build` will be uploaded to Azure in a resource group, and a VM will be created, along with the necessary resources (virtual network, subnet, storage account, network security group, public IP address).
+When running `linuxkit run azure`, the image you created using `linuxkit build` will be uploaded to Azure in a resource group, and a VM will be created, along with the necessary resources (virtual network, subnet, storage account, network security group, public IP address).
 
 Since Azure does not offer access to the serial output of the VM, you need to have SSH access to the machine in order to attach to it. Please see the example below.
 
@@ -23,7 +23,7 @@ here](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-gro
 
 ## Build an image
 
-Create a new `azure.yml` file [based on the Azure example](../examples/azure.yml), generate a new SSH key and add it in the `yml`, then `moby build -format vhd azure.yml`.
+Create a new `azure.yml` file [based on the Azure example](../examples/azure.yml), generate a new SSH key and add it in the `yml`, then `linuxkit build -format vhd azure.yml`.
 
 
 This will output a `azure.vhd` image.
diff --git a/docs/platform-gcp.md b/docs/platform-gcp.md
index a0243988d..29cee34e1 100644
--- a/docs/platform-gcp.md
+++ b/docs/platform-gcp.md
@@ -50,11 +50,11 @@ Make sure to download the credentials in JSON format and store them somewhere sa
 
 ## Build an image
 
-When using `moby build ...` to build an image, specify `-format gcp` to
+When using `linuxkit build ...` to build an image, specify `-format gcp` to
 build an image in a format that GCP will understand. For example:
 
 ```
-moby build -format gcp myprefix.yml
+linuxkit build -format gcp myprefix.yml
 ```
 
 This will create a local `myprefix.img.tar.gz` compressed image file.
diff --git a/docs/platform-packet.md b/docs/platform-packet.md
index d15c80ec9..8097602f4 100644
--- a/docs/platform-packet.md
+++ b/docs/platform-packet.md
@@ -55,7 +55,7 @@ For example, to boot the [example](../examples/packet.net)
 with a local HTTP server:
 
 ```sh
-moby build packet.yml
+linuxkit build packet.yml
 # run the web server
 # run 'ngrok http 8080' in another window
 PACKET_API_KEY=<API key> PACKET_PROJECT_ID=<Project ID> \
@@ -63,7 +63,7 @@ linuxkit run packet -serve :8080 -base-url <ngrok url> packet
 ```
 
 To boot a `arm64` image for Type 2a machine (`-machine
-baremetal_2a`) you currently need build using `moby build packet.yml packet.arm64.yml` and then un-compress both the kernel and
+baremetal_2a`) you currently need build using `linuxkit build packet.yml packet.arm64.yml` and then un-compress both the kernel and
 the initrd before booting, e.g:
 
 ```sh
diff --git a/docs/platform-rpi3.md b/docs/platform-rpi3.md
index 75e25cacc..ab5dcf12f 100644
--- a/docs/platform-rpi3.md
+++ b/docs/platform-rpi3.md
@@ -22,7 +22,7 @@ build. See the [`kernel`](./kernels.md) documentation for details.
 
 We use the mainline Linux kernels for the Raspberry Pi and it is
 booted via [`uboot`](https://www.denx.de/wiki/U-Boot). The `moby`
-tool, via `moby build -format rpi3 <YAML>`, currently produces a `tar`
+tool, via `linuxkit build -format rpi3 <YAML>`, currently produces a `tar`
 archive which can be extracted onto a FAT32 formatted SD card to boot
 your Raspberry Pi.
 
diff --git a/docs/platform-vmware.md b/docs/platform-vmware.md
index d39f00439..735949a22 100644
--- a/docs/platform-vmware.md
+++ b/docs/platform-vmware.md
@@ -21,7 +21,7 @@ Supported (Tested) versions:
 ## Run
 ### VMware Workstation/Fusion
 The backend `vmware` currently supports the booting of a `.vmdk` file that is
-created through the `moby build -format vmdk` command and is typically called with
+created through the `linuxkit build -format vmdk` command and is typically called with
 `linuxkit run vmware <args> ./path`.
 
 The WS/Fusion backend will construct a config version 8 (Hardware version 12)
@@ -30,7 +30,7 @@ use the `vmrun` utility to start the virtual machine.
 
 ### VMware vSphere/vCenter
 The backend `vsphere` currently supports booting through an `iso` file that is
-created through the `moby build -o iso-bios` and is started with `linuxkit run
+created through the `linuxkit build -o iso-bios` and is started with `linuxkit run
 vcenter <args> ./path`.
 
 The vSphere/vCenter backend requires a user to have `pushed` a linuxkit `iso` to
diff --git a/pkg/swap/README.md b/pkg/swap/README.md
index dd03b2417..f6d6acca2 100644
--- a/pkg/swap/README.md
+++ b/pkg/swap/README.md
@@ -78,6 +78,6 @@ An example yml file is included in [examples/swap.yml](../../examples/swap.yml).
 The sample command to run the enclosed is:
 
 ```
-moby build swap.yml
+linuxkit build swap.yml
 linuxkit run -disk size=4G swap
 ```
diff --git a/projects/clear-containers/README.md b/projects/clear-containers/README.md
index d1904c4b7..051d81ebc 100644
--- a/projects/clear-containers/README.md
+++ b/projects/clear-containers/README.md
@@ -67,7 +67,7 @@ To generate the kernel image called `clear-containers-bzImage`, enter the
 following command:
 
 ```
-./bin/moby build ./projects/clear-containers/clear-containers.yml
+./bin/linuxkit build ./projects/clear-containers/clear-containers.yml
 ```
 
 3. Test kernel
diff --git a/projects/clear-containers/tools/Makefile b/projects/clear-containers/tools/Makefile
index ada7261e0..7e1829e00 100644
--- a/projects/clear-containers/tools/Makefile
+++ b/projects/clear-containers/tools/Makefile
@@ -26,7 +26,7 @@ qemu-lite: docker_image $(KERNEL_FILE) $(CMDLINE_FILE)
 		bash
 
 $(KERNEL_FILE):
-	$(MKFILE_DIR)/../../../bin/moby build $(MKFILE_DIR)/../clear-containers.yml
+	$(MKFILE_DIR)/../../../bin/linuxkit build $(MKFILE_DIR)/../clear-containers.yml
 
 push: docker_image
 	docker push clearcontainers/$(IMAGE)
diff --git a/projects/compose/Makefile b/projects/compose/Makefile
index 43efc9c6f..a271f2efb 100644
--- a/projects/compose/Makefile
+++ b/projects/compose/Makefile
@@ -22,11 +22,11 @@ push: tag
 
 dynamic:
 	mkdir -p dist
-	moby build -name compose-dynamic -dir dist/ compose-dynamic.yml
+	linuxkit build -name compose-dynamic -dir dist/ compose-dynamic.yml
 
 static: cache-images
 	mkdir -p dist
-	moby build -name compose-static -dir dist/ compose-static.yml
+	linuxkit build -name compose-static -dir dist/ compose-static.yml
 
 run-dynamic:
 	linuxkit run dist/compose-dynamic
diff --git a/projects/etcd/README.md b/projects/etcd/README.md
index b96103f5f..8ca4b785e 100644
--- a/projects/etcd/README.md
+++ b/projects/etcd/README.md
@@ -85,7 +85,7 @@ docker run --rm -ti etcd.local etcdctl member list
 docker run --rm -ti etcd.local etcdctl cluster-health
 ```
 
-You can perform rolling updates, by for example, switching the kernel version in `etcd.yml`, build a new moby, e.g., `moby build -name etcd-4.10 etcd`, update `infrakit.json`, and then commit the new configuration to InfraKit: `infrakit group commit infrakit.json`.
+You can perform rolling updates, by for example, switching the kernel version in `etcd.yml`, build a new moby, e.g., `linuxkit build -name etcd-4.10 etcd`, update `infrakit.json`, and then commit the new configuration to InfraKit: `infrakit group commit infrakit.json`.
 
 
 ## Infrakit GCP setup
diff --git a/projects/ima-namespace/Makefile b/projects/ima-namespace/Makefile
index 7274b5a52..fff3b5348 100644
--- a/projects/ima-namespace/Makefile
+++ b/projects/ima-namespace/Makefile
@@ -3,7 +3,7 @@ run: ima-namespace-kernel
 	../../bin/linuxkit run ima-namespace
 
 ima-namespace-kernel: ima-namespace.yml
-	../../bin/moby build -format kernel+initrd ima-namespace
+	../../bin/linuxkit build -format kernel+initrd ima-namespace
 
 .PHONY: clean
 clean:
diff --git a/projects/miragesdk/README.md b/projects/miragesdk/README.md
index 55be93ec2..32364551c 100644
--- a/projects/miragesdk/README.md
+++ b/projects/miragesdk/README.md
@@ -50,7 +50,7 @@ the hardware support is available.
   development directions.
 
 - We are also packaging up the Alpine `dhcpcd` with the same configuration conventions
-  as the MirageSDK replacement, so that they can swapped in a `moby build` with a single
+  as the MirageSDK replacement, so that they can swapped in a `linuxkit build` with a single
   line change in the YAML file.
 
 - We will engage external reviewers on the security architecture once we have the first
@@ -63,6 +63,6 @@ the hardware support is available.
 # Getting Started
 
 ```
-../../bin/moby build examples/mirage-dhcp.yml`
+../../bin/linuxkit build examples/mirage-dhcp.yml`
 ../../bin/linuxkit run mirage-dhcp
 ```
diff --git a/reports/2017-03-19.md b/reports/2017-03-19.md
index 8d69a5d4b..a9b02d179 100644
--- a/reports/2017-03-19.md
+++ b/reports/2017-03-19.md
@@ -37,7 +37,7 @@ Welcome everyone, looking forward to your contrinutions and working with you. Pl
 
 ## This week
 
-We are working towards a simpler and better documented basic flow. Early next week the `moby` tool will be changed to have `moby build` and `moby run` subcommands. At least initially the `moby run` flow will only be targeted at running locally (hyperkit and kvm, qemu). We may add a third cluster run option later, using infrakit. @rneugeba has been working on Go hyperkit bindings to make this easier in [#1327](https://github.com/docker/moby/pull/1327).
+We are working towards a simpler and better documented basic flow. Early next week the `moby` tool will be changed to have `linuxkit build` and `moby run` subcommands. At least initially the `moby run` flow will only be targeted at running locally (hyperkit and kvm, qemu). We may add a third cluster run option later, using infrakit. @rneugeba has been working on Go hyperkit bindings to make this easier in [#1327](https://github.com/docker/moby/pull/1327).
 
 There is a `--name` option to the `moby` tool to allow configuring of the image names that are built see [#1318](https://github.com/docker/moby/pull/1318) rather than just using the yaml file name.
 
diff --git a/reports/2017-03-26.md b/reports/2017-03-26.md
index 200ca489f..f8554cc35 100644
--- a/reports/2017-03-26.md
+++ b/reports/2017-03-26.md
@@ -18,14 +18,14 @@ A WIP PR for the HPE OKernel work was added [#1373](https://github.com/docker/mo
 
 ## This week
 
-The big change this week was reworking the command line tool, so it now has `moby build` and `moby run` options. The aim of the `moby run` option is to cover the simple cases
+The big change this week was reworking the command line tool, so it now has `linuxkit build` and `moby run` options. The aim of the `moby run` option is to cover the simple cases
 where you want to test out an image you have built; it is not intended as a production tool, just as a simpler workflow for testing. The aim is to have a default option per
 platform, such as the hyperkit option there is for MacOS now, so we will add Qemu/KVM support for Linux and Hyper-V support for Windows. In addition there will be support for
 optional drivers, such as local VMWare Fusion, as discussed in [#1357](https://github.com/docker/moby/pull/1357) which can have their own custom options; we will probably add the GCE
 support here too to make it even simpler to run.
 
-In addition to `moby build` and `moby run` we have previously discussed adding a `moby cluster` type option to simply create a cluster, by default with infrakit, essentially as a
-simple infrakit wrapper. Again this is not intended for production use but just to run simple test and development cases. For production that plan is that `moby build` can produce
+In addition to `linuxkit build` and `moby run` we have previously discussed adding a `moby cluster` type option to simply create a cluster, by default with infrakit, essentially as a
+simple infrakit wrapper. Again this is not intended for production use but just to run simple test and development cases. For production that plan is that `linuxkit build` can produce
 the artifacts you need for your production ops tooling.
 
 A whole lot more code has been moved to Go code this week; in addition to the hyperkit bindings, some of the Docker containers that we were using for build have been removed. The next
diff --git a/reports/2017-04-02.md b/reports/2017-04-02.md
index 5bc0b8fc0..baacac81d 100644
--- a/reports/2017-04-02.md
+++ b/reports/2017-04-02.md
@@ -30,7 +30,7 @@ Small changes:
 - `.yaml` files were renamed to `.yml` for consistency with common usage elsewhere
 - fixes for console handling
 - kernel updates, additional driver support
-- `moby build` now logs what it is doing by default, to help debugging. There is a quiet option to disable.
+- `linuxkit build` now logs what it is doing by default, to help debugging. There is a quiet option to disable.
 
 ## Planned for next week
 
diff --git a/reports/2017-04-30.md b/reports/2017-04-30.md
index 7244f9182..c74595fad 100644
--- a/reports/2017-04-30.md
+++ b/reports/2017-04-30.md
@@ -12,7 +12,7 @@ Quite a few changes post DockerCon as we started making more breaking changes.
 
 ### Command move and rename
 
-The `moby` command was split up, into [`moby/tool`](https://github.com/moby/tool/) for just the assembly phase, ie `moby build` and the `linuxkit` tool in the LinuxKit repo for the parts that are specific to VM images. This is not the final arrangement, in particular the build process will probably be reworked into more phases, and be made more modular. The `linuxkit` command had a `push` stage added, which can push VM images to remote store; currently this supports pushing images to Google Cloud but more will be added. A lot of rework is planned with the `moby` tool, and it will move to [https://github.com/moby/moby](https://github.com/moby/moby) soon.
+The `moby` command was split up, into [`moby/tool`](https://github.com/moby/tool/) for just the assembly phase, ie `linuxkit build` and the `linuxkit` tool in the LinuxKit repo for the parts that are specific to VM images. This is not the final arrangement, in particular the build process will probably be reworked into more phases, and be made more modular. The `linuxkit` command had a `push` stage added, which can push VM images to remote store; currently this supports pushing images to Google Cloud but more will be added. A lot of rework is planned with the `moby` tool, and it will move to [https://github.com/moby/moby](https://github.com/moby/moby) soon.
 
 ### CI
 
diff --git a/reports/2017-05-22.md b/reports/2017-05-22.md
index 67863f163..616e8c7c9 100644
--- a/reports/2017-05-22.md
+++ b/reports/2017-05-22.md
@@ -51,7 +51,7 @@ Documentation:
 ## Issues of interest
 
 - [linuxkit/linuxkit#1835] Build  my own kernel was closed ([@rneugeba] [@justincormack] [@yankunsam])
-- [linuxkit/linuxkit#1841] Windows moby build failed was closed ([@rneugeba] [@tippexs])
+- [linuxkit/linuxkit#1841] Windows linuxkit build failed was closed ([@rneugeba] [@tippexs])
 - [linuxkit/linuxkit#1845] [Question] Run service container with elevated privileges was closed ([@radu-matei])
 - [linuxkit/linuxkit#1846] Can busybox in the root fs be stripped down more? was closed ([@rneugeba] [@justincormack] [@avsm])
 - [linuxkit/linuxkit#1847] Selection of architecture in config by `moby` tool was closed ([@mor1])
@@ -78,7 +78,7 @@ Documentation:
 - [linuxkit/rtf#13] Add ability to run a single test or a group had 3 events ([@rneugeba] [@dave-tucker])
 - [linuxkit/linuxkit#1839] After halt, it will been blocked  and have no response had 4 events ([@yankunsam] [@avsm] [@rneugeba] [@thebsdbox])
 - [linuxkit/linuxkit#1837] `ctr exec -t` hangs had 6 events ([@FrenchBen] [@avsm] [@rneugeba] [@justincormack])
-- [linuxkit/linuxkit#1421] Add build support for Azure to `moby build` had 7 events ([@justincormack] [@radu-matei])
+- [linuxkit/linuxkit#1421] Add build support for Azure to `linuxkit build` had 7 events ([@justincormack] [@radu-matei])
 
 Other reports in this series can be browsed directly in the repository at [linuxkit/linuxkit:/reports](https://github.com/linuxkit/linuxkit/tree/master/reports/).
 
diff --git a/reports/2017-06-19-summit.md b/reports/2017-06-19-summit.md
index cad516206..57f952527 100644
--- a/reports/2017-06-19-summit.md
+++ b/reports/2017-06-19-summit.md
@@ -5,7 +5,7 @@
 - `moby` tool producing disk images
 - Currently moby tool calls out to linuxkit to do the build
 - moby tool was initially just for building linux images but now it supports docker and other formats
-- Could make `moby build` into a library and other tools like Infrakit could use it [PR opened](https://github.com/moby/tool/pull/91)
+- Could make `linuxkit build` into a library and other tools like Infrakit could use it [PR opened](https://github.com/moby/tool/pull/91)
 - Currently Infrakit shells out to Moby tool
 
 ### What platforms do people want to support for Linuxkit?
diff --git a/reports/sig-security/2017-06-21.md b/reports/sig-security/2017-06-21.md
index 0ed920d4f..95e81a0d9 100644
--- a/reports/sig-security/2017-06-21.md
+++ b/reports/sig-security/2017-06-21.md
@@ -43,7 +43,7 @@ Scribe: @mgoelzer
     - integrity
     - freshness
     - survivability after key compromise
-  - Linuxkit yaml files container `trust:` block - tells moby builder that you want to verify all images in a given organization or per image control
+  - Linuxkit yaml files container `trust:` block - tells linuxkit builder that you want to verify all images in a given organization or per image control
   - Moby builder will first check the signatures for all images and validate expiration dates before pulling images
   - Future directions:
     - key pinning for signed packages
diff --git a/test/Makefile b/test/Makefile
index c44ea94bb..0164629be 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,15 +5,11 @@ pr: check-deps test-pr
 # TODO: should have a separate target
 all: check-deps test-pr ltp
 
-MOBY:=$(shell command -v moby 2> /dev/null)
 LINUXKIT:=$(shell command -v linuxkit 2> /dev/null)
 RTF:=$(shell command -v rtf 2> /dev/null)
 
 .PHONY: check-deps
 check-deps:
-ifndef MOBY
-	$(error "moby is not available. please install it.")
-endif
 ifndef LINUXKIT
 	$(error "linuxkit binary not found. please install it.")
 endif
@@ -31,7 +27,7 @@ gcp-hack: ../artifacts/test.img.tar.gz
 ../artifacts/test.img.tar.gz:
 	rm -rf ../artifacts
 	mkdir -p ../artifacts
-	$(MOBY) build -format gcp -pull -name ../artifacts/test hack/test.yml
+	$(LINUXKIT) build -format gcp -pull -name ../artifacts/test hack/test.yml
 
 define check_test_log
 	@cat $1 |grep -q 'test suite PASSED'
@@ -40,7 +36,7 @@ endef
 .PHONY: ltp
 ltp: export CLOUDSDK_IMAGE_NAME?=test-ltp
 ltp: $(LINUXKIT) test-ltp.img.tar.gz
-	$(MOBY) build -format gcp -pull hack/test-ltp.yml
+	$(LINUXKIT) build -format gcp -pull hack/test-ltp.yml
 	$(LINUXKIT) push gcp test-ltp.img.tar.gz
 	$(LINUXKIT) run gcp -skip-cleanup -machine n1-highcpu-4 $(CLOUDSDK_IMAGE_NAME) | tee test-ltp.log
 	$(call check_test_log, test-ltp.log)
diff --git a/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh b/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh
index a1e9c3cdc..828bb4b1b 100644
--- a/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh
+++ b/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name "${NAME}" ../test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" ../test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ] || exit 1
diff --git a/test/cases/000_build/000_outputs/001_iso-bios/test.sh b/test/cases/000_build/000_outputs/001_iso-bios/test.sh
index e824f626c..600ae620c 100644
--- a/test/cases/000_build/000_outputs/001_iso-bios/test.sh
+++ b/test/cases/000_build/000_outputs/001_iso-bios/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -format iso-bios -name "${NAME}" ../test.yml
+linuxkit build -format iso-bios -name "${NAME}" ../test.yml
 [ -f "${NAME}.iso" ] || exit 1
 
 exit 0
diff --git a/test/cases/000_build/000_outputs/002_iso-efi/test.sh b/test/cases/000_build/000_outputs/002_iso-efi/test.sh
index e710b7c87..1211506fd 100644
--- a/test/cases/000_build/000_outputs/002_iso-efi/test.sh
+++ b/test/cases/000_build/000_outputs/002_iso-efi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -format iso-efi -name "${NAME}" ../test.yml
+linuxkit build -format iso-efi -name "${NAME}" ../test.yml
 [ -f "${NAME}"-efi.iso ] || exit 1
 
 exit 0
diff --git a/test/cases/000_build/000_outputs/003_gcp/test.sh b/test/cases/000_build/000_outputs/003_gcp/test.sh
index 8eb53b3b5..86b2bcb82 100644
--- a/test/cases/000_build/000_outputs/003_gcp/test.sh
+++ b/test/cases/000_build/000_outputs/003_gcp/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -format gcp -name "${NAME}" ../test.yml
+linuxkit build -format gcp -name "${NAME}" ../test.yml
 [ -f "${NAME}.img.tar.gz" ] || exit 1
 
 exit 0
diff --git a/test/cases/000_build/000_outputs/004_aws/test.sh b/test/cases/000_build/000_outputs/004_aws/test.sh
index b972cb7a5..36ca4da7e 100644
--- a/test/cases/000_build/000_outputs/004_aws/test.sh
+++ b/test/cases/000_build/000_outputs/004_aws/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -format aws -name "${NAME}" ../test.yml
+linuxkit build -format aws -name "${NAME}" ../test.yml
 [ -f "${NAME}.raw" ] || exit 1
 
 exit 0
diff --git a/test/cases/000_build/000_outputs/006_vhd/test.sh b/test/cases/000_build/000_outputs/006_vhd/test.sh
index a94c2f52b..d1ba66de2 100644
--- a/test/cases/000_build/000_outputs/006_vhd/test.sh
+++ b/test/cases/000_build/000_outputs/006_vhd/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -format vhd -name "${NAME}" ../test.yml
+linuxkit build -format vhd -name "${NAME}" ../test.yml
 [ -f "${NAME}.vhd" ] || exit 1
 
 exit 0
diff --git a/test/cases/000_build/000_outputs/007_vmdk/test.sh b/test/cases/000_build/000_outputs/007_vmdk/test.sh
index 8a62bb2db..3ac459d13 100644
--- a/test/cases/000_build/000_outputs/007_vmdk/test.sh
+++ b/test/cases/000_build/000_outputs/007_vmdk/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -format vmdk -name "${NAME}" ../test.yml
+linuxkit build -format vmdk -name "${NAME}" ../test.yml
 [ -f "${NAME}.vmdk" ] || exit 1
 
 exit 0
diff --git a/test/cases/000_build/000_outputs/008_raw_bios/test.sh b/test/cases/000_build/000_outputs/008_raw_bios/test.sh
index ee353aa6b..55d3f241a 100644
--- a/test/cases/000_build/000_outputs/008_raw_bios/test.sh
+++ b/test/cases/000_build/000_outputs/008_raw_bios/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -format raw-bios -name "${NAME}" ../test.yml
+linuxkit build -format raw-bios -name "${NAME}" ../test.yml
 [ -f "${NAME}-bios.img" ] || exit 1
 
 exit 0
diff --git a/test/cases/000_build/000_outputs/009_raw_efi/test.sh b/test/cases/000_build/000_outputs/009_raw_efi/test.sh
index 8466e0add..9eebfbef3 100644
--- a/test/cases/000_build/000_outputs/009_raw_efi/test.sh
+++ b/test/cases/000_build/000_outputs/009_raw_efi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -format raw-efi -name "${NAME}" ../test.yml
+linuxkit build -format raw-efi -name "${NAME}" ../test.yml
 [ -f "${NAME}-efi.img" ] || exit 1
 
 exit 0
diff --git a/test/cases/000_build/000_outputs/010_qcow2_bios/test.sh b/test/cases/000_build/000_outputs/010_qcow2_bios/test.sh
index 72091f5cd..5f84df9db 100644
--- a/test/cases/000_build/000_outputs/010_qcow2_bios/test.sh
+++ b/test/cases/000_build/000_outputs/010_qcow2_bios/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -format qcow2-bios -name "${NAME}" ../test.yml
+linuxkit build -format qcow2-bios -name "${NAME}" ../test.yml
 [ -f "${NAME}.qcow2" ] || exit 1
 
 exit 0
diff --git a/test/cases/000_build/100_examples/000_minimal/test.sh b/test/cases/000_build/100_examples/000_minimal/test.sh
index 0c7cd9e89..23d69a4e3 100644
--- a/test/cases/000_build/100_examples/000_minimal/test.sh
+++ b/test/cases/000_build/100_examples/000_minimal/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
+linuxkit build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 
diff --git a/test/cases/000_build/100_examples/010_docker/test.sh b/test/cases/000_build/100_examples/010_docker/test.sh
index cd54b477d..2dcffde26 100644
--- a/test/cases/000_build/100_examples/010_docker/test.sh
+++ b/test/cases/000_build/100_examples/010_docker/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
+linuxkit build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 
diff --git a/test/cases/000_build/100_examples/020_sshd/test.sh b/test/cases/000_build/100_examples/020_sshd/test.sh
index 85eaa701a..464cc69a4 100644
--- a/test/cases/000_build/100_examples/020_sshd/test.sh
+++ b/test/cases/000_build/100_examples/020_sshd/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
+linuxkit build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 
diff --git a/test/cases/000_build/100_examples/030_redis/test.sh b/test/cases/000_build/100_examples/030_redis/test.sh
index 1732d8cd4..6422040db 100644
--- a/test/cases/000_build/100_examples/030_redis/test.sh
+++ b/test/cases/000_build/100_examples/030_redis/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
+linuxkit build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 
diff --git a/test/cases/000_build/100_examples/040_swap/test.sh b/test/cases/000_build/100_examples/040_swap/test.sh
index f8abdd5e1..a76ad265a 100644
--- a/test/cases/000_build/100_examples/040_swap/test.sh
+++ b/test/cases/000_build/100_examples/040_swap/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
+linuxkit build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 
diff --git a/test/cases/000_build/100_examples/050_node_exporter/test.sh b/test/cases/000_build/100_examples/050_node_exporter/test.sh
index 9855817fc..0f2a994a4 100644
--- a/test/cases/000_build/100_examples/050_node_exporter/test.sh
+++ b/test/cases/000_build/100_examples/050_node_exporter/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
+linuxkit build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 
diff --git a/test/cases/000_build/100_examples/060_tpm/test.sh b/test/cases/000_build/100_examples/060_tpm/test.sh
index 7918d6ecd..57ea35aab 100644
--- a/test/cases/000_build/100_examples/060_tpm/test.sh
+++ b/test/cases/000_build/100_examples/060_tpm/test.sh
@@ -17,6 +17,6 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml"
+linuxkit build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml"
 
 exit 0
diff --git a/test/cases/000_build/100_examples/070_wireguard/test.sh b/test/cases/000_build/100_examples/070_wireguard/test.sh
index 014b3d628..f0495dd1a 100644
--- a/test/cases/000_build/100_examples/070_wireguard/test.sh
+++ b/test/cases/000_build/100_examples/070_wireguard/test.sh
@@ -17,6 +17,6 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
+linuxkit build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
diff --git a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh b/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh
index edc8b9c6a..b50f47bb9 100644
--- a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh
+++ b/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -name "${NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${NAME}/docker-ce.yml"
+linuxkit build -name "${NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${NAME}/docker-ce.yml"
 
 exit 0
 
diff --git a/test/cases/000_build/group.sh b/test/cases/000_build/group.sh
index 55db0da11..72b77fae6 100644
--- a/test/cases/000_build/group.sh
+++ b/test/cases/000_build/group.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# SUMMARY: LinuxKit tests for 'moby build'
+# SUMMARY: LinuxKit tests for 'linuxkit build'
 # LABELS:
 
 group_init() {
diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh b/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh
index ec71059c1..d9d626ad7 100644
--- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh
+++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh
@@ -15,7 +15,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1
diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.sh b/test/cases/010_platforms/000_qemu/010_run_iso/test.sh
index 2803e24da..914f12ecf 100644
--- a/test/cases/010_platforms/000_qemu/010_run_iso/test.sh
+++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.sh
@@ -15,7 +15,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format iso-bios -name "${NAME}" test.yml
+linuxkit build -format iso-bios -name "${NAME}" test.yml
 [ -f "${NAME}.iso" ] || exit 1
 linuxkit run qemu -iso "${NAME}.iso" | grep -q "Welcome to LinuxKit"
 
diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.sh b/test/cases/010_platforms/000_qemu/020_run_efi/test.sh
index 6077ed991..7be876aca 100644
--- a/test/cases/010_platforms/000_qemu/020_run_efi/test.sh
+++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.sh
@@ -25,7 +25,7 @@ if command -v qemu-system-x86_64; then
 	fi
 fi
 
-moby build -format iso-efi -name "${NAME}" test.yml
+linuxkit build -format iso-efi -name "${NAME}" test.yml
 [ -f "${NAME}-efi.iso" ] || exit 1
 linuxkit run qemu -iso -uefi "${NAME}-efi.iso" | grep -q "Welcome to LinuxKit"
 
diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh
index fad0db79d..bd57df17b 100644
--- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh
+++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh
@@ -15,7 +15,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format qcow2-bios -name "${NAME}" test.yml
+linuxkit build -format qcow2-bios -name "${NAME}" test.yml
 [ -f "${NAME}.qcow2" ] || exit 1
 linuxkit run qemu "${NAME}.qcow2" | grep -q "Welcome to LinuxKit"
 
diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh
index e65467eb6..da2d06b84 100644
--- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh
+++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh
@@ -15,7 +15,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format raw-bios -name "${NAME}" test.yml
+linuxkit build -format raw-bios -name "${NAME}" test.yml
 [ -f "${NAME}-bios.img" ] || exit 1
 linuxkit run qemu "${NAME}-bios.img" | grep -q "Welcome to LinuxKit"
 
diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.sh b/test/cases/010_platforms/000_qemu/050_run_aws/test.sh
index 4c4bff9ab..5dbde93f2 100644
--- a/test/cases/010_platforms/000_qemu/050_run_aws/test.sh
+++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.sh
@@ -15,7 +15,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format aws -name "${NAME}" test.yml
+linuxkit build -format aws -name "${NAME}" test.yml
 [ -f "${NAME}.raw" ] || exit 1
 linuxkit run qemu "${NAME}.raw" | grep -q "Welcome to LinuxKit"
 
diff --git a/test/cases/010_platforms/000_qemu/100_container/test.sh b/test/cases/010_platforms/000_qemu/100_container/test.sh
index 412c3f207..9938f4a49 100644
--- a/test/cases/010_platforms/000_qemu/100_container/test.sh
+++ b/test/cases/010_platforms/000_qemu/100_container/test.sh
@@ -26,7 +26,7 @@ if [ -z "${QEMU}" ]; then
     exit $RT_CANCEL
 fi
 
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1
diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh
index 6d72d9a0e..cefd02dbb 100644
--- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh
+++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh
@@ -15,7 +15,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1
diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.sh b/test/cases/010_platforms/010_hyperkit/010_acpi/test.sh
index af6823279..aede24eac 100644
--- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.sh
+++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.sh
@@ -15,7 +15,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ] || exit 1
diff --git a/test/cases/020_kernel/000_config_4.4.x/test.sh b/test/cases/020_kernel/000_config_4.4.x/test.sh
index ec2bd3ed2..fdfccb99c 100644
--- a/test/cases/020_kernel/000_config_4.4.x/test.sh
+++ b/test/cases/020_kernel/000_config_4.4.x/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/001_config_4.9.x/test.sh b/test/cases/020_kernel/001_config_4.9.x/test.sh
index ec2bd3ed2..fdfccb99c 100644
--- a/test/cases/020_kernel/001_config_4.9.x/test.sh
+++ b/test/cases/020_kernel/001_config_4.9.x/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/005_config_4.13.x/test.sh b/test/cases/020_kernel/005_config_4.13.x/test.sh
index ec2bd3ed2..fdfccb99c 100644
--- a/test/cases/020_kernel/005_config_4.13.x/test.sh
+++ b/test/cases/020_kernel/005_config_4.13.x/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/006_config_4.14.x/test.sh b/test/cases/020_kernel/006_config_4.14.x/test.sh
index ec2bd3ed2..fdfccb99c 100644
--- a/test/cases/020_kernel/006_config_4.14.x/test.sh
+++ b/test/cases/020_kernel/006_config_4.14.x/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/010_kmod_4.9.x/test.sh b/test/cases/020_kernel/010_kmod_4.9.x/test.sh
index 82662eb13..e845162e5 100644
--- a/test/cases/020_kernel/010_kmod_4.9.x/test.sh
+++ b/test/cases/020_kernel/010_kmod_4.9.x/test.sh
@@ -24,7 +24,7 @@ docker pull linuxkit/kernel:4.9.62
 docker build -t ${IMAGE_NAME} .
 
 # Build and run a LinuxKit image with kernel module (and test script)
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "Hello LinuxKit"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
index 48440c966..548353d7b 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
index 2b842759d..67fe8fca3 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
index 5db10bae2..1e0af3419 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
index f31241072..6c9481ebd 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
index d56fa1eca..d423d0b2c 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
index 451482015..375d6c4ff 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
index 681aa5690..a0c735d19 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
index 2e439c023..0caa324fe 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
index e3981dad8..f442ecbb3 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
index e9b0a2fc6..59d8c33bd 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
index a3bde3083..6e7404222 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
index 217479cf1..312bfe5d6 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
index a63800d4d..a1b40c93e 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
index cdac9a483..c43e0e6f4 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
index 542be314f..97d387934 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
index 2ddcd9280..072cf8ccc 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
index db48d1f2f..c22c3f17a 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
index 50d4569f0..6da036c5a 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
index 512101bec..eea48607b 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
index e0bb379d2..1955a4eb6 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
index bd322b16c..ffe0f0ae2 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
index b1565660a..f9b6dc010 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
index eb1d1171d..098299673 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
index 17bad482d..c4ad61354 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
index 96ef9223d..7b853e807 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
index 471b4222f..ec038a2f9 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
index 512042037..0b3b2b51e 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
index 8bf14b78b..e6cdead68 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
index d1cca637e..7a034441a 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
index 9e2b08ba0..bd6ee9297 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
index af0286699..2d4e0b45e 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
index 17ba91764..66e3c5ca9 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
index 6b0ff92cb..5bfcf54a7 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
index ed86fb859..4b9080054 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
index 3071827da..648fe0e38 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
index 28d58bd06..a26ef736e 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
index 770eed1b3..75b750279 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
index 3dbb6e740..a07797bc8 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
index 96b781974..1e0510c87 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
index 3355c8322..246af5ea1 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
index bb17ddcdb..48fd07f1f 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
index 8c8150f40..95fd609fe 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
index 919735129..d60b1f3ad 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
index ec328b8fe..d0d21cd23 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
index 1fa811933..e3d232d68 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
index 8c106b5a6..09a6670a2 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
index c3d419e85..da2db4708 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
index 77da56f79..91c784f50 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
index cde07a2a4..db1b72cb3 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.sh
index 389e227e9..354851f30 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
index c2eff9ae5..e2870eecd 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.sh
index 15f817161..39542014a 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
index 2d9f47982..b85800212 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.sh
index 8e532284f..c12c41213 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
index fb1657082..f3054ce0a 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.sh
index 6c92f82d5..3e00fec41 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
index 352beef41..a48dece2a 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.sh
index e0503fcf6..cee5a8540 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
index 5b4cb13c0..c830d8b00 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.sh
index aa40686bc..c9b3128f4 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.sh
index 8b086cb4a..3537d952f 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
index 31470eacb..2a8a5159a 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.sh
index 5a4068273..af913221d 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.sh
index 45fbab7d0..19d13f5cb 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.sh
index 646888e7d..655c20b8e 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.sh
index 9a9f134e2..555556e95 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.sh
index 9bf9c0dd9..8828a067f 100644
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
index 48440c966..548353d7b 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
index 2b842759d..67fe8fca3 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
index 5db10bae2..1e0af3419 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
index f31241072..6c9481ebd 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
index d56fa1eca..d423d0b2c 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
index 451482015..375d6c4ff 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
index 681aa5690..a0c735d19 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
index 2e439c023..0caa324fe 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
index e3981dad8..f442ecbb3 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
index e9b0a2fc6..59d8c33bd 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
index a3bde3083..6e7404222 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
index 217479cf1..312bfe5d6 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
index a63800d4d..a1b40c93e 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
index cdac9a483..c43e0e6f4 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
index 542be314f..97d387934 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
index 2ddcd9280..072cf8ccc 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
index db48d1f2f..c22c3f17a 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
index 50d4569f0..6da036c5a 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
index 512101bec..eea48607b 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
index e0bb379d2..1955a4eb6 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
index bd322b16c..ffe0f0ae2 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
index b1565660a..f9b6dc010 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
index eb1d1171d..098299673 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
index 17bad482d..c4ad61354 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
index 96ef9223d..7b853e807 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
index 471b4222f..ec038a2f9 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
index 512042037..0b3b2b51e 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
index 8bf14b78b..e6cdead68 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
index d1cca637e..7a034441a 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
index 9e2b08ba0..bd6ee9297 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
index af0286699..2d4e0b45e 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
index 17ba91764..66e3c5ca9 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
index 6b0ff92cb..5bfcf54a7 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
index ed86fb859..4b9080054 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
index 3071827da..648fe0e38 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
index 28d58bd06..a26ef736e 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
index 770eed1b3..75b750279 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
index 3dbb6e740..a07797bc8 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
index 96b781974..1e0510c87 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
index 3355c8322..246af5ea1 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
index bb17ddcdb..48fd07f1f 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
index 8c8150f40..95fd609fe 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
index 919735129..d60b1f3ad 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
index ec328b8fe..d0d21cd23 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
index 1fa811933..e3d232d68 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
index 8c106b5a6..09a6670a2 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
index c3d419e85..da2db4708 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
index 77da56f79..91c784f50 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
index cde07a2a4..db1b72cb3 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.sh
index 389e227e9..354851f30 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
index c2eff9ae5..e2870eecd 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.sh
index 15f817161..39542014a 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
index 2d9f47982..b85800212 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.sh
index 8e532284f..c12c41213 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
index fb1657082..f3054ce0a 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.sh
index 6c92f82d5..3e00fec41 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
index 352beef41..a48dece2a 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.sh
index e0503fcf6..cee5a8540 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
index 5b4cb13c0..c830d8b00 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.sh
index aa40686bc..c9b3128f4 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.sh
index 8b086cb4a..3537d952f 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
index 31470eacb..2a8a5159a 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.sh
index 5a4068273..af913221d 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.sh
index 45fbab7d0..19d13f5cb 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.sh
index 646888e7d..655c20b8e 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.sh
index 9a9f134e2..555556e95 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.sh
index 9bf9c0dd9..8828a067f 100644
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
index 48440c966..548353d7b 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
index 2b842759d..67fe8fca3 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
index 5db10bae2..1e0af3419 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
index f31241072..6c9481ebd 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
index d56fa1eca..d423d0b2c 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
index 451482015..375d6c4ff 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
index 681aa5690..a0c735d19 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
index 2e439c023..0caa324fe 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
index e3981dad8..f442ecbb3 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
index e9b0a2fc6..59d8c33bd 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
index a3bde3083..6e7404222 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
index 217479cf1..312bfe5d6 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
index a63800d4d..a1b40c93e 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
index cdac9a483..c43e0e6f4 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
index 542be314f..97d387934 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
index 2ddcd9280..072cf8ccc 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
index db48d1f2f..c22c3f17a 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
index 50d4569f0..6da036c5a 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
index 512101bec..eea48607b 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
index e0bb379d2..1955a4eb6 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
index bd322b16c..ffe0f0ae2 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
index b1565660a..f9b6dc010 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
index eb1d1171d..098299673 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
index 17bad482d..c4ad61354 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
index 96ef9223d..7b853e807 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
index 471b4222f..ec038a2f9 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
index 512042037..0b3b2b51e 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
index 8bf14b78b..e6cdead68 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
index d1cca637e..7a034441a 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
index 9e2b08ba0..bd6ee9297 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
index af0286699..2d4e0b45e 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
index 17ba91764..66e3c5ca9 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
index 6b0ff92cb..5bfcf54a7 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
index ed86fb859..4b9080054 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
index 3071827da..648fe0e38 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
index 28d58bd06..a26ef736e 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
index 770eed1b3..75b750279 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
index 3dbb6e740..a07797bc8 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
index 96b781974..1e0510c87 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
index 3355c8322..246af5ea1 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
index bb17ddcdb..48fd07f1f 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
index 8c8150f40..95fd609fe 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
index 919735129..d60b1f3ad 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
index ec328b8fe..d0d21cd23 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
index 1fa811933..e3d232d68 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
index 8c106b5a6..09a6670a2 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
index c3d419e85..da2db4708 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
index 77da56f79..91c784f50 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
index cde07a2a4..db1b72cb3 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single/test.sh
index 389e227e9..354851f30 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
index c2eff9ae5..e2870eecd 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single/test.sh
index 15f817161..39542014a 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
index 2d9f47982..b85800212 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi/test.sh
index 8e532284f..c12c41213 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
index fb1657082..f3054ce0a 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single/test.sh
index 6c92f82d5..3e00fec41 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
index 352beef41..a48dece2a 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single/test.sh
index e0503fcf6..cee5a8540 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
index 5b4cb13c0..c830d8b00 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi/test.sh
index aa40686bc..c9b3128f4 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/010_veth-unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/010_veth-unix-domain-echo/test.sh
index 8b086cb4a..3537d952f 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/010_veth-unix-domain-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/010_veth-unix-domain-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
index 31470eacb..2a8a5159a 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/012_veth-ipv4-echo/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/012_veth-ipv4-echo/test.sh
index 5a4068273..af913221d 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/012_veth-ipv4-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/012_veth-ipv4-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/013_veth-ipv6-echo/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/013_veth-ipv6-echo/test.sh
index 45fbab7d0..19d13f5cb 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/013_veth-ipv6-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/013_veth-ipv6-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/014_veth-tcp-echo/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/014_veth-tcp-echo/test.sh
index 646888e7d..655c20b8e 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/014_veth-tcp-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/014_veth-tcp-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/015_veth-udp-echo/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/015_veth-udp-echo/test.sh
index 9a9f134e2..555556e95 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/015_veth-udp-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/015_veth-udp-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/020_unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/020_unix-domain-echo/test.sh
index 9bf9c0dd9..8828a067f 100644
--- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/020_unix-domain-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/020_unix-domain-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
index 48440c966..548353d7b 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
index 2b842759d..67fe8fca3 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
index 5db10bae2..1e0af3419 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
index f31241072..6c9481ebd 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
index d56fa1eca..d423d0b2c 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
index 451482015..375d6c4ff 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
index 681aa5690..a0c735d19 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
index 2e439c023..0caa324fe 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
index e3981dad8..f442ecbb3 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
index e9b0a2fc6..59d8c33bd 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
index a3bde3083..6e7404222 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
index 217479cf1..312bfe5d6 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
index a63800d4d..a1b40c93e 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
index cdac9a483..c43e0e6f4 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
index 542be314f..97d387934 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
index 2ddcd9280..072cf8ccc 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
index db48d1f2f..c22c3f17a 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
index 50d4569f0..6da036c5a 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
index 512101bec..eea48607b 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
index e0bb379d2..1955a4eb6 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
index bd322b16c..ffe0f0ae2 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
index b1565660a..f9b6dc010 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
index eb1d1171d..098299673 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
index 17bad482d..c4ad61354 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
index 96ef9223d..7b853e807 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
index 471b4222f..ec038a2f9 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
index 512042037..0b3b2b51e 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
index 8bf14b78b..e6cdead68 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
index d1cca637e..7a034441a 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
index 9e2b08ba0..bd6ee9297 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
index af0286699..2d4e0b45e 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
index 17ba91764..66e3c5ca9 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
index 6b0ff92cb..5bfcf54a7 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
index ed86fb859..4b9080054 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
index 3071827da..648fe0e38 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
index 28d58bd06..a26ef736e 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
index 770eed1b3..75b750279 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
index 3dbb6e740..a07797bc8 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
index 96b781974..1e0510c87 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
index 3355c8322..246af5ea1 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
index bb17ddcdb..48fd07f1f 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
index 8c8150f40..95fd609fe 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
index 919735129..d60b1f3ad 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
index ec328b8fe..d0d21cd23 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
index 1fa811933..e3d232d68 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
index 8c106b5a6..09a6670a2 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
index c3d419e85..da2db4708 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
index 77da56f79..91c784f50 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
index cde07a2a4..db1b72cb3 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single/test.sh
index 389e227e9..354851f30 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
index c2eff9ae5..e2870eecd 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single/test.sh
index 15f817161..39542014a 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
index 2d9f47982..b85800212 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi/test.sh
index 8e532284f..c12c41213 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
index fb1657082..f3054ce0a 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single/test.sh
index 6c92f82d5..3e00fec41 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
index 352beef41..a48dece2a 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single/test.sh
index e0503fcf6..cee5a8540 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
index 5b4cb13c0..c830d8b00 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi/test.sh
index aa40686bc..c9b3128f4 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/010_veth-unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/010_veth-unix-domain-echo/test.sh
index 8b086cb4a..3537d952f 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/010_veth-unix-domain-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/010_veth-unix-domain-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
index 31470eacb..2a8a5159a 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/012_veth-ipv4-echo/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/012_veth-ipv4-echo/test.sh
index 5a4068273..af913221d 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/012_veth-ipv4-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/012_veth-ipv4-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/013_veth-ipv6-echo/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/013_veth-ipv6-echo/test.sh
index 45fbab7d0..19d13f5cb 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/013_veth-ipv6-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/013_veth-ipv6-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/014_veth-tcp-echo/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/014_veth-tcp-echo/test.sh
index 646888e7d..655c20b8e 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/014_veth-tcp-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/014_veth-tcp-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/015_veth-udp-echo/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/015_veth-udp-echo/test.sh
index 9a9f134e2..555556e95 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/015_veth-udp-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/015_veth-udp-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/020_unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/020_unix-domain-echo/test.sh
index 9bf9c0dd9..8828a067f 100644
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/020_unix-domain-echo/test.sh
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/020_unix-domain-echo/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
+linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
 RESULT="$(linuxkit run -cpus 2 ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/030_security/010_ports/test.sh b/test/cases/030_security/010_ports/test.sh
index 1bdaf5207..5908cb04d 100644
--- a/test/cases/030_security/010_ports/test.sh
+++ b/test/cases/030_security/010_ports/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 linuxkit run qemu -kernel "${NAME}"
 #RESULT=$(linuxkit run qemu -kernel "${NAME}")
 #echo "${RESULT}" | grep -q "PASSED"
diff --git a/test/cases/040_packages/002_binfmt/test.sh b/test/cases/040_packages/002_binfmt/test.sh
index d31df4406..0f8c8363d 100644
--- a/test/cases/040_packages/002_binfmt/test.sh
+++ b/test/cases/040_packages/002_binfmt/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/003_ca-certificates/test.sh b/test/cases/040_packages/003_ca-certificates/test.sh
index ea6554f03..0f84928b8 100644
--- a/test/cases/040_packages/003_ca-certificates/test.sh
+++ b/test/cases/040_packages/003_ca-certificates/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 RESULT="$(linuxkit run $NAME)"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/003_containerd/test.sh b/test/cases/040_packages/003_containerd/test.sh
index 352616b28..c0b40dcec 100644
--- a/test/cases/040_packages/003_containerd/test.sh
+++ b/test/cases/040_packages/003_containerd/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 RESULT="$(linuxkit run -mem 2048 -disk size=2G ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/040_packages/004_dhcpcd/test.sh b/test/cases/040_packages/004_dhcpcd/test.sh
index 978112a52..6ddd4372a 100644
--- a/test/cases/040_packages/004_dhcpcd/test.sh
+++ b/test/cases/040_packages/004_dhcpcd/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 RESULT="$(linuxkit run $NAME)"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/005_extend/000_ext4/test.sh b/test/cases/040_packages/005_extend/000_ext4/test.sh
index f4845d68b..be7146f56 100644
--- a/test/cases/040_packages/005_extend/000_ext4/test.sh
+++ b/test/cases/040_packages/005_extend/000_ext4/test.sh
@@ -19,12 +19,12 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -name "${NAME_CREATE}" -format kernel+initrd test-create.yml
+linuxkit build -name "${NAME_CREATE}" -format kernel+initrd test-create.yml
 linuxkit run -disk file="${DISK}",format=raw,size=256M "${NAME_CREATE}"
 [ -f "${DISK}" ] || exit 1
 # osx takes issue with bs=1M
 dd if=/dev/zero bs=1048576 count=256 >> "${DISK}"
-moby build -format kernel+initrd -name ${NAME_EXTEND} test.yml
+linuxkit build -format kernel+initrd -name ${NAME_EXTEND} test.yml
 RESULT="$(linuxkit run -disk file=${DISK} ${NAME_EXTEND})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.sh b/test/cases/040_packages/005_extend/001_btrfs/test.sh
index e393d4280..5b9e06bc8 100644
--- a/test/cases/040_packages/005_extend/001_btrfs/test.sh
+++ b/test/cases/040_packages/005_extend/001_btrfs/test.sh
@@ -19,12 +19,12 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -name "${NAME_CREATE}" -format kernel+initrd test-create.yml
+linuxkit build -name "${NAME_CREATE}" -format kernel+initrd test-create.yml
 linuxkit run -disk file="${DISK}",format=raw,size=256M "${NAME_CREATE}"
 [ -f "${DISK}" ] || exit 1
 # osx takes issue with bs=1M
 dd if=/dev/zero bs=1048576 count=256 >> "${DISK}"
-moby build -format kernel+initrd -name ${NAME_EXTEND} test.yml
+linuxkit build -format kernel+initrd -name ${NAME_EXTEND} test.yml
 RESULT="$(linuxkit run -disk file=${DISK} ${NAME_EXTEND})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/005_extend/002_xfs/test.sh b/test/cases/040_packages/005_extend/002_xfs/test.sh
index d53d6bf6f..c2330e9c8 100644
--- a/test/cases/040_packages/005_extend/002_xfs/test.sh
+++ b/test/cases/040_packages/005_extend/002_xfs/test.sh
@@ -19,12 +19,12 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -name "${NAME_CREATE}" -format kernel+initrd test-create.yml
+linuxkit build -name "${NAME_CREATE}" -format kernel+initrd test-create.yml
 linuxkit run -disk file="${DISK}",format=raw,size=256M "${NAME_CREATE}"
 [ -f "${DISK}" ] || exit 1
 # osx takes issue with bs=1M
 dd if=/dev/zero bs=1048576 count=256 >> "${DISK}"
-moby build -format kernel+initrd -name ${NAME_EXTEND} test.yml
+linuxkit build -format kernel+initrd -name ${NAME_EXTEND} test.yml
 RESULT="$(linuxkit run -disk file=${DISK} ${NAME_EXTEND})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.sh b/test/cases/040_packages/006_format_mount/000_auto/test.sh
index 3e1064584..b690c527a 100644
--- a/test/cases/040_packages/006_format_mount/000_auto/test.sh
+++ b/test/cases/040_packages/006_format_mount/000_auto/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} test.yml
+linuxkit build -format kernel+initrd -name ${NAME} test.yml
 RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.sh b/test/cases/040_packages/006_format_mount/001_by_label/test.sh
index 58fac1bd9..b9f532d6a 100644
--- a/test/cases/040_packages/006_format_mount/001_by_label/test.sh
+++ b/test/cases/040_packages/006_format_mount/001_by_label/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} test.yml
+linuxkit build -format kernel+initrd -name ${NAME} test.yml
 RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.sh b/test/cases/040_packages/006_format_mount/002_by_name/test.sh
index 603342be4..c7b4febb2 100644
--- a/test/cases/040_packages/006_format_mount/002_by_name/test.sh
+++ b/test/cases/040_packages/006_format_mount/002_by_name/test.sh
@@ -24,7 +24,7 @@ else
 fi
 
 sed -e "s,@DEVICE@,${DEVICE},g" test.yml.in > test.yml
-moby build -format kernel+initrd -name ${NAME} test.yml
+linuxkit build -format kernel+initrd -name ${NAME} test.yml
 RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.sh b/test/cases/040_packages/006_format_mount/003_btrfs/test.sh
index cec0f437f..1a555e75c 100644
--- a/test/cases/040_packages/006_format_mount/003_btrfs/test.sh
+++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.sh
@@ -18,7 +18,7 @@ clean_up() {
 trap clean_up EXIT
 
 
-moby build -format kernel+initrd -name ${NAME} test.yml
+linuxkit build -format kernel+initrd -name ${NAME} test.yml
 RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.sh b/test/cases/040_packages/006_format_mount/004_xfs/test.sh
index b35b9db05..0ea8af0ac 100644
--- a/test/cases/040_packages/006_format_mount/004_xfs/test.sh
+++ b/test/cases/040_packages/006_format_mount/004_xfs/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} test.yml
+linuxkit build -format kernel+initrd -name ${NAME} test.yml
 RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.sh b/test/cases/040_packages/006_format_mount/005_by_device_force/test.sh
index 41fa9db78..8a7abf08c 100755
--- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.sh
+++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.sh
@@ -18,7 +18,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} test.yml
+linuxkit build -format kernel+initrd -name ${NAME} test.yml
 RESULT="$(linuxkit run -disk file=${DISK1},size=512M -disk file=${DISK2},size=512M ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.sh b/test/cases/040_packages/006_format_mount/010_multiple/test.sh
index 41fa9db78..8a7abf08c 100644
--- a/test/cases/040_packages/006_format_mount/010_multiple/test.sh
+++ b/test/cases/040_packages/006_format_mount/010_multiple/test.sh
@@ -18,7 +18,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name ${NAME} test.yml
+linuxkit build -format kernel+initrd -name ${NAME} test.yml
 RESULT="$(linuxkit run -disk file=${DISK1},size=512M -disk file=${DISK2},size=512M ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/007_getty-containerd/test.sh b/test/cases/040_packages/007_getty-containerd/test.sh
index 8b59f0c26..a01ada414 100755
--- a/test/cases/040_packages/007_getty-containerd/test.sh
+++ b/test/cases/040_packages/007_getty-containerd/test.sh
@@ -16,7 +16,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1
diff --git a/test/cases/040_packages/013_mkimage/test.sh b/test/cases/040_packages/013_mkimage/test.sh
index c0cab9220..9a9926156 100644
--- a/test/cases/040_packages/013_mkimage/test.sh
+++ b/test/cases/040_packages/013_mkimage/test.sh
@@ -18,8 +18,8 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd run.yml
-moby build -format kernel+initrd mkimage.yml
+linuxkit build -format kernel+initrd run.yml
+linuxkit build -format kernel+initrd mkimage.yml
 tar cf tarball.img run-kernel run-initrd.img run-cmdline
 linuxkit run qemu -disk disk.qcow2,size=200M,format=qcow2 -disk tarball.img,format=raw -kernel mkimage
 linuxkit run qemu disk.qcow2
diff --git a/test/cases/040_packages/019_sysctl/test.sh b/test/cases/040_packages/019_sysctl/test.sh
index 8f2169c88..d14e35239 100644
--- a/test/cases/040_packages/019_sysctl/test.sh
+++ b/test/cases/040_packages/019_sysctl/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/cases/040_packages/023_wireguard/test.sh b/test/cases/040_packages/023_wireguard/test.sh
index 9976f7b46..7dd0685d4 100644
--- a/test/cases/040_packages/023_wireguard/test.sh
+++ b/test/cases/040_packages/023_wireguard/test.sh
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd -name "${NAME}" test.yml
+linuxkit build -format kernel+initrd -name "${NAME}" test.yml
 RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
diff --git a/test/pkg/virtsock/README.md b/test/pkg/virtsock/README.md
index e4739dbea..36229b828 100644
--- a/test/pkg/virtsock/README.md
+++ b/test/pkg/virtsock/README.md
@@ -5,7 +5,7 @@ The client, to be run on the host as per this [README](https://github.com/rneuge
 
 ## How to use (on Windows)
 
-- Build the images: `moby build tests/cases/test-virtsock-server.yml`
+- Build the images: `linuxkit build tests/cases/test-virtsock-server.yml`
 - Copy the `test-virtsock-server.iso` to a Windows system
 - Create a Type 1 Hyper-V VM (called `virtsock`).
   - No Disk or network required