diff --git a/api/client/commands.go b/api/client/commands.go
index a6a2e35539..08ca36b342 100644
--- a/api/client/commands.go
+++ b/api/client/commands.go
@@ -91,7 +91,7 @@ func (cli *DockerCli) CmdHelp(args ...string) error {
 
 // FIXME: 'insert' is deprecated.
 func (cli *DockerCli) CmdInsert(args ...string) error {
-	fmt.Fprintf(os.Stderr, "Warning: '%s' is deprecated and will be removed in a future version. Please use 'docker build' and 'ADD' instead.\n")
+	fmt.Fprintf(os.Stderr, "Warning: 'insert' is deprecated and will be removed in a future version. Please use 'docker build' and 'ADD' instead.\n")
 	cmd := cli.Subcmd("insert", "IMAGE URL PATH", "Insert a file from URL in the IMAGE at PATH")
 	if err := cmd.Parse(args); err != nil {
 		return nil
diff --git a/archive/archive_test.go b/archive/archive_test.go
index 72ffd99565..ea34f0798b 100644
--- a/archive/archive_test.go
+++ b/archive/archive_test.go
@@ -164,6 +164,6 @@ func TestUntarUstarGnuConflict(t *testing.T) {
 		}
 	}
 	if !found {
-		t.Fatal("%s not found in the archive", "root/.cpanm/work/1395823785.24209/Plack-1.0030/blib/man3/Plack::Middleware::LighttpdScriptNameFix.3pm")
+		t.Fatalf("%s not found in the archive", "root/.cpanm/work/1395823785.24209/Plack-1.0030/blib/man3/Plack::Middleware::LighttpdScriptNameFix.3pm")
 	}
 }
diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go
index c7e4857394..31c3f391e4 100644
--- a/daemon/graphdriver/devmapper/deviceset.go
+++ b/daemon/graphdriver/devmapper/deviceset.go
@@ -55,7 +55,7 @@ type DevInfo struct {
 }
 
 type MetaData struct {
-	Devices     map[string]*DevInfo `json:devices`
+	Devices     map[string]*DevInfo `json:"Devices"`
 	devicesLock sync.Mutex          `json:"-"` // Protects all read/writes to Devices map
 }
 
diff --git a/daemon/graphdriver/graphtest/graphtest.go b/daemon/graphdriver/graphtest/graphtest.go
index d53878c45a..a667f2afa6 100644
--- a/daemon/graphdriver/graphtest/graphtest.go
+++ b/daemon/graphdriver/graphtest/graphtest.go
@@ -1,12 +1,13 @@
 package graphtest
 
 import (
-	"github.com/dotcloud/docker/daemon/graphdriver"
 	"io/ioutil"
 	"os"
 	"path"
 	"syscall"
 	"testing"
+
+	"github.com/dotcloud/docker/daemon/graphdriver"
 )
 
 var (
@@ -94,10 +95,10 @@ func verifyFile(t *testing.T, path string, mode os.FileMode, uid, gid uint32) {
 
 	if stat, ok := fi.Sys().(*syscall.Stat_t); ok {
 		if stat.Uid != uid {
-			t.Fatal("%s no owned by uid %d", path, uid)
+			t.Fatalf("%s no owned by uid %d", path, uid)
 		}
 		if stat.Gid != gid {
-			t.Fatal("%s not owned by gid %d", path, gid)
+			t.Fatalf("%s not owned by gid %d", path, gid)
 		}
 	}
 
diff --git a/engine/streams_test.go b/engine/streams_test.go
index 83dd05c6f4..5cfd5d0e6c 100644
--- a/engine/streams_test.go
+++ b/engine/streams_test.go
@@ -141,7 +141,7 @@ func TestOutputAdd(t *testing.T) {
 		t.Fatalf("Expected %d, got %d", len(input), n)
 	}
 	if output := b.String(); output != input {
-		t.Fatal("Received wrong data from Add.\nExpected: '%s'\nGot:     '%s'", input, output)
+		t.Fatalf("Received wrong data from Add.\nExpected: '%s'\nGot:     '%s'", input, output)
 	}
 }
 
diff --git a/engine/table.go b/engine/table.go
index 292c4ed677..c7fe3ab444 100644
--- a/engine/table.go
+++ b/engine/table.go
@@ -137,5 +137,4 @@ func (t *Table) ReadFrom(src io.Reader) (n int64, err error) {
 		}
 		t.Add(env)
 	}
-	return 0, nil
 }
diff --git a/integration-cli/docker_cli_images_test.go b/integration-cli/docker_cli_images_test.go
index 82b70bab40..b27bc870fe 100644
--- a/integration-cli/docker_cli_images_test.go
+++ b/integration-cli/docker_cli_images_test.go
@@ -27,14 +27,14 @@ func TestCLIImageTagRemove(t *testing.T) {
 	{
 		imagesAfter, _, _ := cmd(t, "images", "-a")
 		if nLines(imagesAfter) != nLines(imagesBefore)+3 {
-			t.Fatalf("before: %#s\n\nafter: %#s\n", imagesBefore, imagesAfter)
+			t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter)
 		}
 	}
 	cmd(t, "rmi", "utest/docker:tag2")
 	{
 		imagesAfter, _, _ := cmd(t, "images", "-a")
 		if nLines(imagesAfter) != nLines(imagesBefore)+2 {
-			t.Fatalf("before: %#s\n\nafter: %#s\n", imagesBefore, imagesAfter)
+			t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter)
 		}
 
 	}
@@ -42,7 +42,7 @@ func TestCLIImageTagRemove(t *testing.T) {
 	{
 		imagesAfter, _, _ := cmd(t, "images", "-a")
 		if nLines(imagesAfter) != nLines(imagesBefore)+1 {
-			t.Fatalf("before: %#s\n\nafter: %#s\n", imagesBefore, imagesAfter)
+			t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter)
 		}
 
 	}
@@ -50,7 +50,7 @@ func TestCLIImageTagRemove(t *testing.T) {
 	{
 		imagesAfter, _, _ := cmd(t, "images", "-a")
 		if nLines(imagesAfter) != nLines(imagesBefore)+0 {
-			t.Fatalf("before: %#s\n\nafter: %#s\n", imagesBefore, imagesAfter)
+			t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter)
 		}
 
 	}
diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go
index d8e04de8c2..e937863a45 100644
--- a/integration-cli/docker_cli_run_test.go
+++ b/integration-cli/docker_cli_run_test.go
@@ -450,32 +450,32 @@ func TestVolumeWithSymlink(t *testing.T) {
 	buildCmd.Dir = buildDirectory
 	err := buildCmd.Run()
 	if err != nil {
-		t.Fatal("could not build 'docker-test-volumewithsymlink': %v", err)
+		t.Fatalf("could not build 'docker-test-volumewithsymlink': %v", err)
 	}
 
 	cmd := exec.Command(dockerBinary, "run", "-v", "/bar/foo", "--name", "test-volumewithsymlink", "docker-test-volumewithsymlink", "sh", "-c", "mount | grep -q /foo/foo")
 	exitCode, err := runCommand(cmd)
 	if err != nil || exitCode != 0 {
-		t.Fatal("[run] err: %v, exitcode: %d", err, exitCode)
+		t.Fatalf("[run] err: %v, exitcode: %d", err, exitCode)
 	}
 
 	var volPath string
 	cmd = exec.Command(dockerBinary, "inspect", "-f", "{{range .Volumes}}{{.}}{{end}}", "test-volumewithsymlink")
 	volPath, exitCode, err = runCommandWithOutput(cmd)
 	if err != nil || exitCode != 0 {
-		t.Fatal("[inspect] err: %v, exitcode: %d", err, exitCode)
+		t.Fatalf("[inspect] err: %v, exitcode: %d", err, exitCode)
 	}
 
 	cmd = exec.Command(dockerBinary, "rm", "-v", "test-volumewithsymlink")
 	exitCode, err = runCommand(cmd)
 	if err != nil || exitCode != 0 {
-		t.Fatal("[rm] err: %v, exitcode: %d", err, exitCode)
+		t.Fatalf("[rm] err: %v, exitcode: %d", err, exitCode)
 	}
 
 	f, err := os.Open(volPath)
 	defer f.Close()
 	if !os.IsNotExist(err) {
-		t.Fatal("[open] (expecting 'file does not exist' error) err: %v, volPath: %s", err, volPath)
+		t.Fatalf("[open] (expecting 'file does not exist' error) err: %v, volPath: %s", err, volPath)
 	}
 
 	deleteImages("docker-test-volumewithsymlink")
diff --git a/pkg/graphdb/graphdb_test.go b/pkg/graphdb/graphdb_test.go
index 0c3e8670e0..8cddd0bf48 100644
--- a/pkg/graphdb/graphdb_test.go
+++ b/pkg/graphdb/graphdb_test.go
@@ -1,13 +1,14 @@
 package graphdb
 
 import (
-	_ "code.google.com/p/gosqlite/sqlite3"
 	"database/sql"
 	"fmt"
 	"os"
 	"path"
 	"strconv"
 	"testing"
+
+	_ "code.google.com/p/gosqlite/sqlite3"
 )
 
 func newTestDb(t *testing.T) (*Database, string) {
@@ -535,6 +536,6 @@ func TestConcurrentWrites(t *testing.T) {
 		}
 	}
 	if any {
-		t.Fatal()
+		t.Fail()
 	}
 }
diff --git a/pkg/mflag/example/example.go b/pkg/mflag/example/example.go
index 2d78baa172..8af8ff9cf4 100644
--- a/pkg/mflag/example/example.go
+++ b/pkg/mflag/example/example.go
@@ -28,8 +28,8 @@ func main() {
 		flag.PrintDefaults()
 	} else {
 		fmt.Printf("s/#hidden/-string: %s\n", str)
-		fmt.Printf("b: %b\n", b)
-		fmt.Printf("-bool: %b\n", b2)
+		fmt.Printf("b: %t\n", b)
+		fmt.Printf("-bool: %t\n", b2)
 		fmt.Printf("s/#hidden/-string(via lookup): %s\n", flag.Lookup("s").Value.String())
 		fmt.Printf("ARGS: %v\n", flag.Args())
 	}
diff --git a/registry/registry_test.go b/registry/registry_test.go
index 2aae80edac..5cec059505 100644
--- a/registry/registry_test.go
+++ b/registry/registry_test.go
@@ -264,7 +264,7 @@ func TestAddRequiredHeadersToRedirectedRequests(t *testing.T) {
 		AddRequiredHeadersToRedirectedRequests(reqTo, []*http.Request{reqFrom})
 
 		if len(reqTo.Header) != 1 {
-			t.Fatal("Expected 1 headers, got %d", len(reqTo.Header))
+			t.Fatalf("Expected 1 headers, got %d", len(reqTo.Header))
 		}
 
 		if reqTo.Header.Get("Content-Type") != "application/json" {
@@ -288,7 +288,7 @@ func TestAddRequiredHeadersToRedirectedRequests(t *testing.T) {
 		AddRequiredHeadersToRedirectedRequests(reqTo, []*http.Request{reqFrom})
 
 		if len(reqTo.Header) != 2 {
-			t.Fatal("Expected 2 headers, got %d", len(reqTo.Header))
+			t.Fatalf("Expected 2 headers, got %d", len(reqTo.Header))
 		}
 
 		if reqTo.Header.Get("Content-Type") != "application/json" {
diff --git a/utils/tarsum_test.go b/utils/tarsum_test.go
index 52ddd64590..e84abde916 100644
--- a/utils/tarsum_test.go
+++ b/utils/tarsum_test.go
@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"crypto/rand"
 	"fmt"
-	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 	"io"
 	"io/ioutil"
 	"os"
 	"testing"
+
+	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
 )
 
 type testLayer struct {
@@ -109,7 +110,7 @@ func TestTarSums(t *testing.T) {
 			fh = sizedTar(*layer.options)
 		} else {
 			// What else is there to test?
-			t.Errorf("what to do with %#V", layer)
+			t.Errorf("what to do with %#v", layer)
 			continue
 		}
 		if file, ok := fh.(*os.File); ok {