@@ -30,6 +30,7 @@ type DockerSuite struct {

 func (s *DockerSuite) TearDownTest(c *check.C) {

 	deleteAllContainers()

+	deleteAllImages()

 	s.TimerSuite.TearDownTest(c)

 }

@@ -632,7 +632,6 @@ func (s *DockerSuite) TestContainerApiCommit(c *check.C) {

 	if err := json.Unmarshal(b, &img); err != nil {

 		c.Fatal(err)

 	}

-	defer deleteImages(img.Id)

 	cmd, err := inspectField(img.Id, "Config.Cmd")

 	if err != nil {

@@ -30,7 +30,6 @@ func (s *DockerSuite) TestApiImagesFilter(c *check.C) {

 	name := "utest:tag1"

 	name2 := "utest/docker:tag2"

 	name3 := "utest:5000/docker:tag3"

-	defer deleteImages(name, name2, name3)

 	for _, n := range []string{name, name2, name3} {

 		if out, err := exec.Command(dockerBinary, "tag", "busybox", n).CombinedOutput(); err != nil {

 			c.Fatal(err, out)

@@ -74,7 +73,6 @@ func (s *DockerSuite) TestApiImagesSaveAndLoad(c *check.C) {

 		c.Fatal(err)

 	}

 	id := strings.TrimSpace(out)

-	defer deleteImages("saveandload")

 	status, body, err := sockRequestRaw("GET", "/images/"+id+"/get", nil, "")

 	c.Assert(status, check.Equals, http.StatusOK)

@@ -27,7 +27,6 @@ import (

 func (s *DockerSuite) TestBuildJSONEmptyRun(c *check.C) {

 	name := "testbuildjsonemptyrun"

-	defer deleteImages(name)

 	_, err := buildImage(

 		name,

@@ -45,7 +44,6 @@ func (s *DockerSuite) TestBuildJSONEmptyRun(c *check.C) {

 func (s *DockerSuite) TestBuildEmptyWhitespace(c *check.C) {

 	name := "testbuildemptywhitespace"

-	defer deleteImages(name)

 	_, err := buildImage(

 		name,

@@ -65,7 +63,6 @@ func (s *DockerSuite) TestBuildEmptyWhitespace(c *check.C) {

 func (s *DockerSuite) TestBuildShCmdJSONEntrypoint(c *check.C) {

 	name := "testbuildshcmdjsonentrypoint"

-	defer deleteImages(name)

 	_, err := buildImage(

 		name,

@@ -99,7 +96,6 @@ func (s *DockerSuite) TestBuildShCmdJSONEntrypoint(c *check.C) {

 func (s *DockerSuite) TestBuildEnvironmentReplacementUser(c *check.C) {

 	name := "testbuildenvironmentreplacement"

-	defer deleteImages(name)

 	_, err := buildImage(name, `

   FROM scratch

@@ -123,7 +119,6 @@ func (s *DockerSuite) TestBuildEnvironmentReplacementUser(c *check.C) {

 func (s *DockerSuite) TestBuildEnvironmentReplacementVolume(c *check.C) {

 	name := "testbuildenvironmentreplacement"

-	defer deleteImages(name)

 	_, err := buildImage(name, `

   FROM scratch

@@ -153,7 +148,6 @@ func (s *DockerSuite) TestBuildEnvironmentReplacementVolume(c *check.C) {

 func (s *DockerSuite) TestBuildEnvironmentReplacementExpose(c *check.C) {

 	name := "testbuildenvironmentreplacement"

-	defer deleteImages(name)

 	_, err := buildImage(name, `

   FROM scratch

@@ -183,7 +177,6 @@ func (s *DockerSuite) TestBuildEnvironmentReplacementExpose(c *check.C) {

 func (s *DockerSuite) TestBuildEnvironmentReplacementWorkdir(c *check.C) {

 	name := "testbuildenvironmentreplacement"

-	defer deleteImages(name)

 	_, err := buildImage(name, `

   FROM busybox

@@ -200,7 +193,6 @@ func (s *DockerSuite) TestBuildEnvironmentReplacementWorkdir(c *check.C) {

 func (s *DockerSuite) TestBuildEnvironmentReplacementAddCopy(c *check.C) {

 	name := "testbuildenvironmentreplacement"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`

   FROM scratch

@@ -236,8 +228,6 @@ func (s *DockerSuite) TestBuildEnvironmentReplacementAddCopy(c *check.C) {

 func (s *DockerSuite) TestBuildEnvironmentReplacementEnv(c *check.C) {

 	name := "testbuildenvironmentreplacement"

-	defer deleteImages(name)

-

 	_, err := buildImage(name,

 		`

   FROM busybox

@@ -305,8 +295,6 @@ func (s *DockerSuite) TestBuildEnvironmentReplacementEnv(c *check.C) {

 func (s *DockerSuite) TestBuildHandleEscapes(c *check.C) {

 	name := "testbuildhandleescapes"

-	defer deleteImages(name)

-

 	_, err := buildImage(name,

 		`

   FROM scratch

@@ -395,8 +383,6 @@ func (s *DockerSuite) TestBuildOnBuildLowercase(c *check.C) {

 	name := "testbuildonbuildlowercase"

 	name2 := "testbuildonbuildlowercase2"

-	defer deleteImages(name, name2)

-

 	_, err := buildImage(name,

 		`

   FROM busybox

@@ -427,7 +413,6 @@ func (s *DockerSuite) TestBuildOnBuildLowercase(c *check.C) {

 func (s *DockerSuite) TestBuildEnvEscapes(c *check.C) {

 	name := "testbuildenvescapes"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`

     FROM busybox

@@ -450,7 +435,6 @@ func (s *DockerSuite) TestBuildEnvEscapes(c *check.C) {

 func (s *DockerSuite) TestBuildEnvOverwrite(c *check.C) {

 	name := "testbuildenvoverwrite"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`

@@ -478,8 +462,6 @@ func (s *DockerSuite) TestBuildEnvOverwrite(c *check.C) {

 func (s *DockerSuite) TestBuildOnBuildForbiddenMaintainerInSourceImage(c *check.C) {

 	name := "testbuildonbuildforbiddenmaintainerinsourceimage"

-	defer deleteImages("onbuild")

-	defer deleteImages(name)

 	createCmd := exec.Command(dockerBinary, "create", "busybox", "true")

 	out, _, _, err := runCommandWithStdoutStderr(createCmd)

@@ -510,8 +492,6 @@ func (s *DockerSuite) TestBuildOnBuildForbiddenMaintainerInSourceImage(c *check.

 func (s *DockerSuite) TestBuildOnBuildForbiddenFromInSourceImage(c *check.C) {

 	name := "testbuildonbuildforbiddenfrominsourceimage"

-	defer deleteImages("onbuild")

-	defer deleteImages(name)

 	createCmd := exec.Command(dockerBinary, "create", "busybox", "true")

 	out, _, _, err := runCommandWithStdoutStderr(createCmd)

@@ -542,8 +522,6 @@ func (s *DockerSuite) TestBuildOnBuildForbiddenFromInSourceImage(c *check.C) {

 func (s *DockerSuite) TestBuildOnBuildForbiddenChainedInSourceImage(c *check.C) {

 	name := "testbuildonbuildforbiddenchainedinsourceimage"

-	defer deleteImages("onbuild")

-	defer deleteImages(name)

 	createCmd := exec.Command(dockerBinary, "create", "busybox", "true")

 	out, _, _, err := runCommandWithStdoutStderr(createCmd)

@@ -576,9 +554,6 @@ func (s *DockerSuite) TestBuildOnBuildCmdEntrypointJSON(c *check.C) {

 	name1 := "onbuildcmd"

 	name2 := "onbuildgenerated"

-	defer deleteImages(name2)

-	defer deleteImages(name1)

-

 	_, err := buildImage(name1, `

 FROM busybox

 ONBUILD CMD ["hello world"]

@@ -611,9 +586,6 @@ func (s *DockerSuite) TestBuildOnBuildEntrypointJSON(c *check.C) {

 	name1 := "onbuildcmd"

 	name2 := "onbuildgenerated"

-	defer deleteImages(name2)

-	defer deleteImages(name1)

-

 	_, err := buildImage(name1, `

 FROM busybox

 ONBUILD ENTRYPOINT ["echo"]`,

@@ -642,7 +614,6 @@ ONBUILD ENTRYPOINT ["echo"]`,

 func (s *DockerSuite) TestBuildCacheADD(c *check.C) {

 	name := "testbuildtwoimageswithadd"

-	defer deleteImages(name)

 	server, err := fakeStorage(map[string]string{

 		"robots.txt": "hello",

 		"index.html": "world",

@@ -677,7 +648,6 @@ func (s *DockerSuite) TestBuildCacheADD(c *check.C) {

 func (s *DockerSuite) TestBuildLastModified(c *check.C) {

 	name := "testbuildlastmodified"

-	defer deleteImages(name)

 	server, err := fakeStorage(map[string]string{

 		"file": "hello",

@@ -743,7 +713,6 @@ RUN ls -le /file`

 func (s *DockerSuite) TestBuildSixtySteps(c *check.C) {

 	name := "foobuildsixtysteps"

-	defer deleteImages(name)

 	ctx, err := fakeContext("FROM scratch\n"+strings.Repeat("ADD foo /\n", 60),

 		map[string]string{

 			"foo": "test1",

@@ -760,7 +729,6 @@ func (s *DockerSuite) TestBuildSixtySteps(c *check.C) {

 func (s *DockerSuite) TestBuildAddSingleFileToRoot(c *check.C) {

 	name := "testaddimg"

-	defer deleteImages(name)

 	ctx, err := fakeContext(fmt.Sprintf(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -786,7 +754,6 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`, expecte

 // Issue #3960: "ADD src ." hangs

 func (s *DockerSuite) TestBuildAddSingleFileToWorkdir(c *check.C) {

 	name := "testaddsinglefiletoworkdir"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 ADD test_file .`,

 		map[string]string{

@@ -813,7 +780,6 @@ ADD test_file .`,

 func (s *DockerSuite) TestBuildAddSingleFileToExistDir(c *check.C) {

 	name := "testaddsinglefiletoexistdir"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -847,7 +813,6 @@ func (s *DockerSuite) TestBuildCopyAddMultipleFiles(c *check.C) {

 	defer server.Close()

 	name := "testcopymultiplefilestofile"

-	defer deleteImages(name)

 	ctx, err := fakeContext(fmt.Sprintf(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -884,7 +849,6 @@ RUN [ $(ls -l /exists/exists_file | awk '{print $3":"$4}') = 'dockerio:dockerio'

 func (s *DockerSuite) TestBuildAddMultipleFilesToFile(c *check.C) {

 	name := "testaddmultiplefilestofile"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM scratch

 	ADD file1.txt file2.txt test

 	`,

@@ -906,7 +870,6 @@ func (s *DockerSuite) TestBuildAddMultipleFilesToFile(c *check.C) {

 func (s *DockerSuite) TestBuildJSONAddMultipleFilesToFile(c *check.C) {

 	name := "testjsonaddmultiplefilestofile"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM scratch

 	ADD ["file1.txt", "file2.txt", "test"]

 	`,

@@ -928,7 +891,6 @@ func (s *DockerSuite) TestBuildJSONAddMultipleFilesToFile(c *check.C) {

 func (s *DockerSuite) TestBuildAddMultipleFilesToFileWild(c *check.C) {

 	name := "testaddmultiplefilestofilewild"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM scratch

 	ADD file*.txt test

 	`,

@@ -950,7 +912,6 @@ func (s *DockerSuite) TestBuildAddMultipleFilesToFileWild(c *check.C) {

 func (s *DockerSuite) TestBuildJSONAddMultipleFilesToFileWild(c *check.C) {

 	name := "testjsonaddmultiplefilestofilewild"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM scratch

 	ADD ["file*.txt", "test"]

 	`,

@@ -972,7 +933,6 @@ func (s *DockerSuite) TestBuildJSONAddMultipleFilesToFileWild(c *check.C) {

 func (s *DockerSuite) TestBuildCopyMultipleFilesToFile(c *check.C) {

 	name := "testcopymultiplefilestofile"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM scratch

 	COPY file1.txt file2.txt test

 	`,

@@ -994,7 +954,6 @@ func (s *DockerSuite) TestBuildCopyMultipleFilesToFile(c *check.C) {

 func (s *DockerSuite) TestBuildJSONCopyMultipleFilesToFile(c *check.C) {

 	name := "testjsoncopymultiplefilestofile"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM scratch

 	COPY ["file1.txt", "file2.txt", "test"]

 	`,

@@ -1016,7 +975,6 @@ func (s *DockerSuite) TestBuildJSONCopyMultipleFilesToFile(c *check.C) {

 func (s *DockerSuite) TestBuildAddFileWithWhitespace(c *check.C) {

 	name := "testaddfilewithwhitespace"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 RUN mkdir "/test dir"

 RUN mkdir "/test_dir"

@@ -1052,7 +1010,6 @@ RUN [ $(cat "/test dir/test_file6") = 'test6' ]`,

 func (s *DockerSuite) TestBuildCopyFileWithWhitespace(c *check.C) {

 	name := "testcopyfilewithwhitespace"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 RUN mkdir "/test dir"

 RUN mkdir "/test_dir"

@@ -1088,7 +1045,6 @@ RUN [ $(cat "/test dir/test_file6") = 'test6' ]`,

 func (s *DockerSuite) TestBuildAddMultipleFilesToFileWithWhitespace(c *check.C) {

 	name := "testaddmultiplefilestofilewithwhitespace"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 	ADD [ "test file1", "test file2", "test" ]

     `,

@@ -1110,7 +1066,6 @@ func (s *DockerSuite) TestBuildAddMultipleFilesToFileWithWhitespace(c *check.C)

 func (s *DockerSuite) TestBuildCopyMultipleFilesToFileWithWhitespace(c *check.C) {

 	name := "testcopymultiplefilestofilewithwhitespace"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 	COPY [ "test file1", "test file2", "test" ]

         `,

@@ -1132,7 +1087,6 @@ func (s *DockerSuite) TestBuildCopyMultipleFilesToFileWithWhitespace(c *check.C)

 func (s *DockerSuite) TestBuildCopyWildcard(c *check.C) {

 	name := "testcopywildcard"

-	defer deleteImages(name)

 	server, err := fakeStorage(map[string]string{

 		"robots.txt": "hello",

 		"index.html": "world",

@@ -1183,7 +1137,6 @@ func (s *DockerSuite) TestBuildCopyWildcard(c *check.C) {

 func (s *DockerSuite) TestBuildCopyWildcardNoFind(c *check.C) {

 	name := "testcopywildcardnofind"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 	COPY file*.txt /tmp/

 	`, nil)

@@ -1204,7 +1157,6 @@ func (s *DockerSuite) TestBuildCopyWildcardNoFind(c *check.C) {

 func (s *DockerSuite) TestBuildCopyWildcardCache(c *check.C) {

 	name := "testcopywildcardcache"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 	COPY file1.txt /tmp/`,

 		map[string]string{

@@ -1238,7 +1190,6 @@ func (s *DockerSuite) TestBuildCopyWildcardCache(c *check.C) {

 func (s *DockerSuite) TestBuildAddSingleFileToNonExistingDir(c *check.C) {

 	name := "testaddsinglefiletononexistingdir"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -1264,7 +1215,6 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,

 func (s *DockerSuite) TestBuildAddDirContentToRoot(c *check.C) {

 	name := "testadddircontenttoroot"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -1288,7 +1238,6 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,

 func (s *DockerSuite) TestBuildAddDirContentToExistingDir(c *check.C) {

 	name := "testadddircontenttoexistingdir"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -1314,7 +1263,6 @@ RUN [ $(ls -l /exists/test_file | awk '{print $3":"$4}') = 'root:root' ]`,

 func (s *DockerSuite) TestBuildAddWholeDirToRoot(c *check.C) {

 	name := "testaddwholedirtoroot"

-	defer deleteImages(name)

 	ctx, err := fakeContext(fmt.Sprintf(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -1342,7 +1290,6 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`, expecte

 // Testing #5941

 func (s *DockerSuite) TestBuildAddEtcToRoot(c *check.C) {

 	name := "testaddetctoroot"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM scratch

 ADD . /`,

 		map[string]string{

@@ -1361,7 +1308,6 @@ ADD . /`,

 // Testing #9401

 func (s *DockerSuite) TestBuildAddPreservesFilesSpecialBits(c *check.C) {

 	name := "testaddpreservesfilesspecialbits"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 ADD suidbin /usr/bin/suidbin

 RUN chmod 4755 /usr/bin/suidbin

@@ -1384,7 +1330,6 @@ RUN [ $(ls -l /usr/bin/suidbin | awk '{print $1}') = '-rwsr-xr-x' ]`,

 func (s *DockerSuite) TestBuildCopySingleFileToRoot(c *check.C) {

 	name := "testcopysinglefiletoroot"

-	defer deleteImages(name)

 	ctx, err := fakeContext(fmt.Sprintf(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -1410,7 +1355,6 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`, expecte

 // Issue #3960: "ADD src ." hangs - adapted for COPY

 func (s *DockerSuite) TestBuildCopySingleFileToWorkdir(c *check.C) {

 	name := "testcopysinglefiletoworkdir"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 COPY test_file .`,

 		map[string]string{

@@ -1437,7 +1381,6 @@ COPY test_file .`,

 func (s *DockerSuite) TestBuildCopySingleFileToExistDir(c *check.C) {

 	name := "testcopysinglefiletoexistdir"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -1463,7 +1406,6 @@ RUN [ $(ls -l /exists/exists_file | awk '{print $3":"$4}') = 'dockerio:dockerio'

 func (s *DockerSuite) TestBuildCopySingleFileToNonExistDir(c *check.C) {

 	name := "testcopysinglefiletononexistdir"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -1488,7 +1430,6 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,

 func (s *DockerSuite) TestBuildCopyDirContentToRoot(c *check.C) {

 	name := "testcopydircontenttoroot"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -1512,7 +1453,6 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,

 func (s *DockerSuite) TestBuildCopyDirContentToExistDir(c *check.C) {

 	name := "testcopydircontenttoexistdir"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -1538,7 +1478,6 @@ RUN [ $(ls -l /exists/test_file | awk '{print $3":"$4}') = 'root:root' ]`,

 func (s *DockerSuite) TestBuildCopyWholeDirToRoot(c *check.C) {

 	name := "testcopywholedirtoroot"

-	defer deleteImages(name)

 	ctx, err := fakeContext(fmt.Sprintf(`FROM busybox

 RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

 RUN echo 'dockerio:x:1001:' >> /etc/group

@@ -1565,7 +1504,6 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`, expecte

 func (s *DockerSuite) TestBuildCopyEtcToRoot(c *check.C) {

 	name := "testcopyetctoroot"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM scratch

 COPY . /`,

 		map[string]string{

@@ -1583,7 +1521,6 @@ COPY . /`,

 func (s *DockerSuite) TestBuildCopyDisallowRemote(c *check.C) {

 	name := "testcopydisallowremote"

-	defer deleteImages(name)

 	_, out, err := buildImageWithOut(name, `FROM scratch

 COPY https://index.docker.io/robots.txt /`,

 		true)

@@ -1604,7 +1541,6 @@ func (s *DockerSuite) TestBuildAddBadLinks(c *check.C) {

 	var (

 		name = "test-link-absolute"

 	)

-	defer deleteImages(name)

 	ctx, err := fakeContext(dockerfile, nil)

 	if err != nil {

 		c.Fatal(err)

@@ -1692,7 +1628,6 @@ func (s *DockerSuite) TestBuildAddBadLinksVolume(c *check.C) {

 		name       = "test-link-absolute-volume"

 		dockerfile = ""

 	)

-	defer deleteImages(name)

 	tempDir, err := ioutil.TempDir("", "test-link-absolute-volume-temp-")

 	if err != nil {

@@ -1737,7 +1672,6 @@ func (s *DockerSuite) TestBuildWithInaccessibleFilesInContext(c *check.C) {

 	{

 		name := "testbuildinaccessiblefiles"

-		defer deleteImages(name)

 		ctx, err := fakeContext("FROM scratch\nADD . /foo/", map[string]string{"fileWithoutReadAccess": "foo"})

 		if err != nil {

 			c.Fatal(err)

@@ -1770,7 +1704,6 @@ func (s *DockerSuite) TestBuildWithInaccessibleFilesInContext(c *check.C) {

 	}

 	{

 		name := "testbuildinaccessibledirectory"

-		defer deleteImages(name)

 		ctx, err := fakeContext("FROM scratch\nADD . /foo/", map[string]string{"directoryWeCantStat/bar": "foo"})

 		if err != nil {

 			c.Fatal(err)

@@ -1809,7 +1742,6 @@ func (s *DockerSuite) TestBuildWithInaccessibleFilesInContext(c *check.C) {

 	}

 	{

 		name := "testlinksok"

-		defer deleteImages(name)

 		ctx, err := fakeContext("FROM scratch\nADD . /foo/", nil)

 		if err != nil {

 			c.Fatal(err)

@@ -1829,7 +1761,6 @@ func (s *DockerSuite) TestBuildWithInaccessibleFilesInContext(c *check.C) {

 	}

 	{

 		name := "testbuildignoredinaccessible"

-		defer deleteImages(name)

 		ctx, err := fakeContext("FROM scratch\nADD . /foo/",

 			map[string]string{

 				"directoryWeCantStat/bar": "foo",

@@ -1867,7 +1798,6 @@ func (s *DockerSuite) TestBuildForceRm(c *check.C) {

 		c.Fatalf("failed to get the container count: %s", err)

 	}

 	name := "testbuildforcerm"

-	defer deleteImages(name)

 	ctx, err := fakeContext("FROM scratch\nRUN true\nRUN thiswillfail", nil)

 	if err != nil {

 		c.Fatal(err)

@@ -1903,7 +1833,6 @@ func (s *DockerSuite) TestBuildCancelationKillsSleep(c *check.C) {

 	defer wg.Wait()

 	name := "testbuildcancelation"

-	defer deleteImages(name)

 	// (Note: one year, will never finish)

 	ctx, err := fakeContext("FROM busybox\nRUN sleep 31536000", nil)

@@ -2018,7 +1947,6 @@ func (s *DockerSuite) TestBuildCancelationKillsSleep(c *check.C) {

 func (s *DockerSuite) TestBuildRm(c *check.C) {

 	name := "testbuildrm"

-	defer deleteImages(name)

 	ctx, err := fakeContext("FROM scratch\nADD foo /\nADD foo /", map[string]string{"foo": "bar"})

 	if err != nil {

 		c.Fatal(err)

@@ -2112,7 +2040,6 @@ func (s *DockerSuite) TestBuildWithVolumes(c *check.C) {

 			"/test8]": emptyMap,

 		}

 	)

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM scratch

 		VOLUME /test1

@@ -2146,7 +2073,6 @@ func (s *DockerSuite) TestBuildWithVolumes(c *check.C) {

 func (s *DockerSuite) TestBuildMaintainer(c *check.C) {

 	name := "testbuildmaintainer"

 	expected := "dockerio"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM scratch

         MAINTAINER dockerio`,

@@ -2166,7 +2092,6 @@ func (s *DockerSuite) TestBuildMaintainer(c *check.C) {

 func (s *DockerSuite) TestBuildUser(c *check.C) {

 	name := "testbuilduser"

 	expected := "dockerio"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM busybox

 		RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

@@ -2188,7 +2113,6 @@ func (s *DockerSuite) TestBuildUser(c *check.C) {

 func (s *DockerSuite) TestBuildRelativeWorkdir(c *check.C) {

 	name := "testbuildrelativeworkdir"

 	expected := "/test2/test3"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM busybox

 		RUN [ "$PWD" = '/' ]

@@ -2214,7 +2138,6 @@ func (s *DockerSuite) TestBuildRelativeWorkdir(c *check.C) {

 func (s *DockerSuite) TestBuildWorkdirWithEnvVariables(c *check.C) {

 	name := "testbuildworkdirwithenvvariables"

 	expected := "/test1/test2"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM busybox

 		ENV DIRPATH /test1

@@ -2236,7 +2159,6 @@ func (s *DockerSuite) TestBuildWorkdirWithEnvVariables(c *check.C) {

 func (s *DockerSuite) TestBuildRelativeCopy(c *check.C) {

 	name := "testbuildrelativecopy"

-	defer deleteImages(name)

 	dockerfile := `

 		FROM busybox

 			WORKDIR /test1

@@ -2276,7 +2198,6 @@ func (s *DockerSuite) TestBuildRelativeCopy(c *check.C) {

 func (s *DockerSuite) TestBuildEnv(c *check.C) {

 	name := "testbuildenv"

 	expected := "[PATH=/test:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PORT=2375]"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM busybox

 		ENV PATH /test:$PATH

@@ -2299,7 +2220,6 @@ func (s *DockerSuite) TestBuildContextCleanup(c *check.C) {

 	testRequires(c, SameHostDaemon)

 	name := "testbuildcontextcleanup"

-	defer deleteImages(name)

 	entries, err := ioutil.ReadDir("/var/lib/docker/tmp")

 	if err != nil {

 		c.Fatalf("failed to list contents of tmp dir: %s", err)

@@ -2325,7 +2245,6 @@ func (s *DockerSuite) TestBuildContextCleanupFailedBuild(c *check.C) {

 	testRequires(c, SameHostDaemon)

 	name := "testbuildcontextcleanup"

-	defer deleteImages(name)

 	entries, err := ioutil.ReadDir("/var/lib/docker/tmp")

 	if err != nil {

 		c.Fatalf("failed to list contents of tmp dir: %s", err)

@@ -2350,7 +2269,6 @@ func (s *DockerSuite) TestBuildContextCleanupFailedBuild(c *check.C) {

 func (s *DockerSuite) TestBuildCmd(c *check.C) {

 	name := "testbuildcmd"

 	expected := "{[/bin/echo Hello World]}"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM scratch

         CMD ["/bin/echo", "Hello World"]`,

@@ -2370,7 +2288,6 @@ func (s *DockerSuite) TestBuildCmd(c *check.C) {

 func (s *DockerSuite) TestBuildExpose(c *check.C) {

 	name := "testbuildexpose"

 	expected := "map[2375/tcp:{}]"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM scratch

         EXPOSE 2375`,

@@ -2413,7 +2330,6 @@ func (s *DockerSuite) TestBuildExposeMorePorts(c *check.C) {

 	tmpl.Execute(buf, portList)

 	name := "testbuildexpose"

-	defer deleteImages(name)

 	_, err := buildImage(name, buf.String(), true)

 	if err != nil {

 		c.Fatal(err)

@@ -2458,7 +2374,6 @@ func (s *DockerSuite) TestBuildExposeOrder(c *check.C) {

 	id1 := buildID("testbuildexpose1", "80 2375")

 	id2 := buildID("testbuildexpose2", "2375 80")

-	defer deleteImages("testbuildexpose1", "testbuildexpose2")

 	if id1 != id2 {

 		c.Errorf("EXPOSE should invalidate the cache only when ports actually changed")

 	}

@@ -2467,7 +2382,6 @@ func (s *DockerSuite) TestBuildExposeOrder(c *check.C) {

 func (s *DockerSuite) TestBuildExposeUpperCaseProto(c *check.C) {

 	name := "testbuildexposeuppercaseproto"

 	expected := "map[5678/udp:{}]"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM scratch

         EXPOSE 5678/UDP`,

@@ -2488,7 +2402,6 @@ func (s *DockerSuite) TestBuildExposeHostPort(c *check.C) {

 	// start building docker file with ip:hostPort:containerPort

 	name := "testbuildexpose"

 	expected := "map[5678/tcp:{}]"

-	defer deleteImages(name)

 	_, out, err := buildImageWithOut(name,

 		`FROM scratch

         EXPOSE 192.168.1.2:2375:5678`,

@@ -2513,7 +2426,6 @@ func (s *DockerSuite) TestBuildExposeHostPort(c *check.C) {

 func (s *DockerSuite) TestBuildEmptyEntrypointInheritance(c *check.C) {

 	name := "testbuildentrypointinheritance"

 	name2 := "testbuildentrypointinheritance2"

-	defer deleteImages(name, name2)

 	_, err := buildImage(name,

 		`FROM busybox

@@ -2554,7 +2466,6 @@ func (s *DockerSuite) TestBuildEmptyEntrypointInheritance(c *check.C) {

 func (s *DockerSuite) TestBuildEmptyEntrypoint(c *check.C) {

 	name := "testbuildentrypoint"

-	defer deleteImages(name)

 	expected := "{[]}"

 	_, err := buildImage(name,

@@ -2577,7 +2488,6 @@ func (s *DockerSuite) TestBuildEmptyEntrypoint(c *check.C) {

 func (s *DockerSuite) TestBuildEntrypoint(c *check.C) {

 	name := "testbuildentrypoint"

 	expected := "{[/bin/echo]}"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM scratch

         ENTRYPOINT ["/bin/echo"]`,

@@ -2617,7 +2527,6 @@ func (s *DockerSuite) TestBuildOnBuildLimitedInheritence(c *check.C) {

 		if err != nil {

 			c.Fatalf("build failed to complete: %s, %v", out1, err)

 		}

-		defer deleteImages(name1)

 	}

 	{

 		name2 := "testonbuildtrigger2"

@@ -2634,7 +2543,6 @@ func (s *DockerSuite) TestBuildOnBuildLimitedInheritence(c *check.C) {

 		if err != nil {

 			c.Fatalf("build failed to complete: %s, %v", out2, err)

 		}

-		defer deleteImages(name2)

 	}

 	{

 		name3 := "testonbuildtrigger3"

@@ -2652,7 +2560,6 @@ func (s *DockerSuite) TestBuildOnBuildLimitedInheritence(c *check.C) {

 			c.Fatalf("build failed to complete: %s, %v", out3, err)

 		}

-		defer deleteImages(name3)

 	}

 	// ONBUILD should be run in second build.

@@ -2669,7 +2576,6 @@ func (s *DockerSuite) TestBuildOnBuildLimitedInheritence(c *check.C) {

 func (s *DockerSuite) TestBuildWithCache(c *check.C) {

 	name := "testbuildwithcache"

-	defer deleteImages(name)

 	id1, err := buildImage(name,

 		`FROM scratch

 		MAINTAINER dockerio

@@ -2696,7 +2602,6 @@ func (s *DockerSuite) TestBuildWithCache(c *check.C) {

 func (s *DockerSuite) TestBuildWithoutCache(c *check.C) {

 	name := "testbuildwithoutcache"

 	name2 := "testbuildwithoutcache2"

-	defer deleteImages(name, name2)

 	id1, err := buildImage(name,

 		`FROM scratch

 		MAINTAINER dockerio

@@ -2723,8 +2628,6 @@ func (s *DockerSuite) TestBuildWithoutCache(c *check.C) {

 func (s *DockerSuite) TestBuildConditionalCache(c *check.C) {

 	name := "testbuildconditionalcache"

-	name2 := "testbuildconditionalcache2"

-	defer deleteImages(name, name2)

 	dockerfile := `

 		FROM busybox

@@ -2761,13 +2664,11 @@ func (s *DockerSuite) TestBuildConditionalCache(c *check.C) {

 	if id3 != id2 {

 		c.Fatal("Should have used the cache")

 	}

-

 }

 func (s *DockerSuite) TestBuildADDLocalFileWithCache(c *check.C) {

 	name := "testbuildaddlocalfilewithcache"

 	name2 := "testbuildaddlocalfilewithcache2"

-	defer deleteImages(name, name2)

 	dockerfile := `

 		FROM busybox

         MAINTAINER dockerio

@@ -2796,7 +2697,6 @@ func (s *DockerSuite) TestBuildADDLocalFileWithCache(c *check.C) {

 func (s *DockerSuite) TestBuildADDMultipleLocalFileWithCache(c *check.C) {

 	name := "testbuildaddmultiplelocalfilewithcache"

 	name2 := "testbuildaddmultiplelocalfilewithcache2"

-	defer deleteImages(name, name2)

 	dockerfile := `

 		FROM busybox

         MAINTAINER dockerio

@@ -2825,7 +2725,6 @@ func (s *DockerSuite) TestBuildADDMultipleLocalFileWithCache(c *check.C) {

 func (s *DockerSuite) TestBuildADDLocalFileWithoutCache(c *check.C) {

 	name := "testbuildaddlocalfilewithoutcache"

 	name2 := "testbuildaddlocalfilewithoutcache2"

-	defer deleteImages(name, name2)

 	dockerfile := `

 		FROM busybox

         MAINTAINER dockerio

@@ -2854,7 +2753,6 @@ func (s *DockerSuite) TestBuildADDLocalFileWithoutCache(c *check.C) {

 func (s *DockerSuite) TestBuildCopyDirButNotFile(c *check.C) {

 	name := "testbuildcopydirbutnotfile"

 	name2 := "testbuildcopydirbutnotfile2"

-	defer deleteImages(name, name2)

 	dockerfile := `

         FROM scratch

         COPY dir /tmp/`

@@ -2888,7 +2786,6 @@ func (s *DockerSuite) TestBuildADDCurrentDirWithCache(c *check.C) {

 	name3 := name + "3"

 	name4 := name + "4"

 	name5 := name + "5"

-	defer deleteImages(name, name2, name3, name4, name5)

 	dockerfile := `

         FROM scratch

         MAINTAINER dockerio

@@ -2950,7 +2847,6 @@ func (s *DockerSuite) TestBuildADDCurrentDirWithCache(c *check.C) {

 func (s *DockerSuite) TestBuildADDCurrentDirWithoutCache(c *check.C) {

 	name := "testbuildaddcurrentdirwithoutcache"

 	name2 := "testbuildaddcurrentdirwithoutcache2"

-	defer deleteImages(name, name2)

 	dockerfile := `

         FROM scratch

         MAINTAINER dockerio

@@ -2977,7 +2873,6 @@ func (s *DockerSuite) TestBuildADDCurrentDirWithoutCache(c *check.C) {

 func (s *DockerSuite) TestBuildADDRemoteFileWithCache(c *check.C) {

 	name := "testbuildaddremotefilewithcache"

-	defer deleteImages(name)

 	server, err := fakeStorage(map[string]string{

 		"baz": "hello",

 	})

@@ -3010,7 +2905,6 @@ func (s *DockerSuite) TestBuildADDRemoteFileWithCache(c *check.C) {

 func (s *DockerSuite) TestBuildADDRemoteFileWithoutCache(c *check.C) {

 	name := "testbuildaddremotefilewithoutcache"

 	name2 := "testbuildaddremotefilewithoutcache2"

-	defer deleteImages(name, name2)

 	server, err := fakeStorage(map[string]string{

 		"baz": "hello",

 	})

@@ -3046,8 +2940,6 @@ func (s *DockerSuite) TestBuildADDRemoteFileMTime(c *check.C) {

 	name3 := name + "3"

 	name4 := name + "4"

-	defer deleteImages(name, name2, name3, name4)

-

 	files := map[string]string{"baz": "hello"}

 	server, err := fakeStorage(files)

 	if err != nil {

@@ -3115,7 +3007,6 @@ func (s *DockerSuite) TestBuildADDRemoteFileMTime(c *check.C) {

 func (s *DockerSuite) TestBuildADDLocalAndRemoteFilesWithCache(c *check.C) {

 	name := "testbuildaddlocalandremotefilewithcache"

-	defer deleteImages(name)

 	server, err := fakeStorage(map[string]string{

 		"baz": "hello",

 	})

@@ -3167,7 +3058,6 @@ CMD ["cat", "/foo"]`,

 	}

 	name := "contexttar"

 	buildCmd := exec.Command(dockerBinary, "build", "-t", name, "-")

-	defer deleteImages(name)

 	buildCmd.Stdin = context

 	if out, _, err := runCommandWithOutput(buildCmd); err != nil {

@@ -3194,15 +3084,12 @@ func (s *DockerSuite) TestBuildNoContext(c *check.C) {

 	if out, _ := dockerCmd(c, "run", "--rm", "nocontext"); out != "ok\n" {

 		c.Fatalf("run produced invalid output: %q, expected %q", out, "ok")

 	}

-

-	deleteImages("nocontext")

 }

 // TODO: TestCaching

 func (s *DockerSuite) TestBuildADDLocalAndRemoteFilesWithoutCache(c *check.C) {

 	name := "testbuildaddlocalandremotefilewithoutcache"

 	name2 := "testbuildaddlocalandremotefilewithoutcache2"

-	defer deleteImages(name, name2)

 	server, err := fakeStorage(map[string]string{

 		"baz": "hello",

 	})

@@ -3237,7 +3124,6 @@ func (s *DockerSuite) TestBuildADDLocalAndRemoteFilesWithoutCache(c *check.C) {

 func (s *DockerSuite) TestBuildWithVolumeOwnership(c *check.C) {

 	name := "testbuildimg"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM busybox:latest

@@ -3269,7 +3155,6 @@ func (s *DockerSuite) TestBuildWithVolumeOwnership(c *check.C) {

 // utilizing cache

 func (s *DockerSuite) TestBuildEntrypointRunCleanup(c *check.C) {

 	name := "testbuildcmdcleanup"

-	defer deleteImages(name)

 	if _, err := buildImage(name,

 		`FROM busybox

         RUN echo "hello"`,

@@ -3303,7 +3188,6 @@ func (s *DockerSuite) TestBuildEntrypointRunCleanup(c *check.C) {

 func (s *DockerSuite) TestBuildForbiddenContextPath(c *check.C) {

 	name := "testbuildforbidpath"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM scratch

         ADD ../../ test/

         `,

@@ -3325,7 +3209,6 @@ func (s *DockerSuite) TestBuildForbiddenContextPath(c *check.C) {

 func (s *DockerSuite) TestBuildADDFileNotFound(c *check.C) {

 	name := "testbuildaddnotfound"

-	defer deleteImages(name)

 	ctx, err := fakeContext(`FROM scratch

         ADD foo /usr/local/bar`,

 		map[string]string{"bar": "hello"})

@@ -3344,7 +3227,6 @@ func (s *DockerSuite) TestBuildADDFileNotFound(c *check.C) {

 func (s *DockerSuite) TestBuildInheritance(c *check.C) {

 	name := "testbuildinheritance"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM scratch

@@ -3384,7 +3266,6 @@ func (s *DockerSuite) TestBuildInheritance(c *check.C) {

 func (s *DockerSuite) TestBuildFails(c *check.C) {

 	name := "testbuildfails"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM busybox

 		RUN sh -c "exit 23"`,

@@ -3400,7 +3281,6 @@ func (s *DockerSuite) TestBuildFails(c *check.C) {

 func (s *DockerSuite) TestBuildFailsDockerfileEmpty(c *check.C) {

 	name := "testbuildfails"

-	defer deleteImages(name)

 	_, err := buildImage(name, ``, true)

 	if err != nil {

 		if !strings.Contains(err.Error(), "The Dockerfile (Dockerfile) cannot be empty") {

@@ -3413,7 +3293,6 @@ func (s *DockerSuite) TestBuildFailsDockerfileEmpty(c *check.C) {

 func (s *DockerSuite) TestBuildOnBuild(c *check.C) {

 	name := "testbuildonbuild"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM busybox

 		ONBUILD RUN touch foobar`,

@@ -3432,7 +3311,6 @@ func (s *DockerSuite) TestBuildOnBuild(c *check.C) {

 func (s *DockerSuite) TestBuildOnBuildForbiddenChained(c *check.C) {

 	name := "testbuildonbuildforbiddenchained"

-	defer deleteImages(name)

 	_, err := buildImage(name,

 		`FROM busybox

 		ONBUILD ONBUILD RUN touch foobar`,

@@ -3448,7 +3326,6 @@ func (s *DockerSuite) TestBuildOnBuildForbiddenChained(c *check.C) {

 func (s *DockerSuite) TestBuildOnBuildForbiddenFrom(c *check.C) {

 	name := "testbuildonbuildforbiddenfrom"

-	defer deleteImages(name)

 	_, err := buildImage(name,