@@ -1182,7 +1182,7 @@ func TestRunModeHostname(t *testing.T) {

 		t.Fatal(err)

 	}

 	if actual := strings.Trim(out, "\r\n"); actual != hostname {

-		t.Fatalf("expected %q, but says: '%s'", hostname, actual)

+		t.Fatalf("expected %q, but says: %q", hostname, actual)

 	}

 	deleteAllContainers()

@@ -1357,11 +1357,11 @@ func TestRunDnsOptionsBasedOnHostResolvConf(t *testing.T) {

 	actualSearch := resolvconf.GetSearchDomains([]byte(out))

 	if len(actualSearch) != len(hostSearch) {

-		t.Fatalf("expected %q search domain(s), but it has: '%s'", len(hostSearch), len(actualSearch))

+		t.Fatalf("expected %q search domain(s), but it has: %q", len(hostSearch), len(actualSearch))

 	}

 	for i := range actualSearch {

 		if actualSearch[i] != hostSearch[i] {

-			t.Fatalf("expected %q domain, but says: '%s'", actualSearch[i], hostSearch[i])

+			t.Fatalf("expected %q domain, but says: %q", actualSearch[i], hostSearch[i])

 		}

 	}

@@ -1373,11 +1373,11 @@ func TestRunDnsOptionsBasedOnHostResolvConf(t *testing.T) {

 	actualNameservers := resolvconf.GetNameservers([]byte(out))

 	if len(actualNameservers) != len(hostNamservers) {

-		t.Fatalf("expected %q nameserver(s), but it has: '%s'", len(hostNamservers), len(actualNameservers))

+		t.Fatalf("expected %q nameserver(s), but it has: %q", len(hostNamservers), len(actualNameservers))

 	}

 	for i := range actualNameservers {

 		if actualNameservers[i] != hostNamservers[i] {

-			t.Fatalf("expected %q nameserver, but says: '%s'", actualNameservers[i], hostNamservers[i])

+			t.Fatalf("expected %q nameserver, but says: %q", actualNameservers[i], hostNamservers[i])

 		}

 	}

@@ -1421,7 +1421,7 @@ func TestRunDnsOptionsBasedOnHostResolvConf(t *testing.T) {

 	}

 	for i := range actualSearch {

 		if actualSearch[i] != hostSearch[i] {

-			t.Fatalf("expected %q domain, but says: '%s'", actualSearch[i], hostSearch[i])

+			t.Fatalf("expected %q domain, but says: %q", actualSearch[i], hostSearch[i])

 		}

 	}