diff --git a/daemon/logger/jsonfilelog/jsonfilelog_test.go b/daemon/logger/jsonfilelog/jsonfilelog_test.go
index 97265a7fc7..155086dec6 100644
--- a/daemon/logger/jsonfilelog/jsonfilelog_test.go
+++ b/daemon/logger/jsonfilelog/jsonfilelog_test.go
@@ -188,15 +188,15 @@ func TestJSONFileLoggerWithOpts(t *testing.T) {
 		}
 
 		file, err := os.Open(filename + ".1.gz")
+		if err != nil {
+			t.Fatal(err)
+		}
 		defer file.Close()
-		if err != nil {
-			t.Fatal(err)
-		}
 		zipReader, err := gzip.NewReader(file)
-		defer zipReader.Close()
 		if err != nil {
 			t.Fatal(err)
 		}
+		defer zipReader.Close()
 		penUlt, err = ioutil.ReadAll(zipReader)
 		if err != nil {
 			t.Fatal(err)
@@ -204,15 +204,15 @@ func TestJSONFileLoggerWithOpts(t *testing.T) {
 	}
 
 	file, err := os.Open(filename + ".2.gz")
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer file.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
 	zipReader, err := gzip.NewReader(file)
-	defer zipReader.Close()
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer zipReader.Close()
 	antepenult, err := ioutil.ReadAll(zipReader)
 	if err != nil {
 		t.Fatal(err)