diff --git a/mount/mount_unix_test.go b/mount/mount_unix_test.go
index f36a4ecc..d027e8eb 100644
--- a/mount/mount_unix_test.go
+++ b/mount/mount_unix_test.go
@@ -3,6 +3,7 @@
 package mount
 
 import (
+	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -44,21 +45,20 @@ func TestMounted(t *testing.T) {
 		targetPath = path.Join(targetDir, "file.txt")
 	)
 
-	os.Mkdir(sourceDir, 0777)
-	os.Mkdir(targetDir, 0777)
+	if err := os.Mkdir(sourceDir, 0777); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Mkdir(targetDir, 0777); err != nil {
+		t.Fatal(err)
+	}
 
-	f, err := os.Create(sourcePath)
-	if err != nil {
+	if err := ioutil.WriteFile(sourcePath, []byte("hello"), 0644); err != nil {
 		t.Fatal(err)
 	}
-	f.WriteString("hello")
-	f.Close()
 
-	f, err = os.Create(targetPath)
-	if err != nil {
+	if err := ioutil.WriteFile(targetPath, nil, 0644); err != nil {
 		t.Fatal(err)
 	}
-	f.Close()
 
 	if err := Mount(sourceDir, targetDir, "none", "bind,rw"); err != nil {
 		t.Fatal(err)
@@ -99,21 +99,20 @@ func TestMountReadonly(t *testing.T) {
 		targetPath = path.Join(targetDir, "file.txt")
 	)
 
-	os.Mkdir(sourceDir, 0777)
-	os.Mkdir(targetDir, 0777)
+	if err := os.Mkdir(sourceDir, 0777); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Mkdir(targetDir, 0777); err != nil {
+		t.Fatal(err)
+	}
 
-	f, err := os.Create(sourcePath)
-	if err != nil {
+	if err := ioutil.WriteFile(sourcePath, []byte("hello"), 0644); err != nil {
 		t.Fatal(err)
 	}
-	f.WriteString("hello")
-	f.Close()
 
-	f, err = os.Create(targetPath)
-	if err != nil {
+	if err := ioutil.WriteFile(targetPath, nil, 0644); err != nil {
 		t.Fatal(err)
 	}
-	f.Close()
 
 	if err := Mount(sourceDir, targetDir, "none", "bind,ro"); err != nil {
 		t.Fatal(err)
@@ -124,8 +123,7 @@ func TestMountReadonly(t *testing.T) {
 		}
 	}()
 
-	_, err = os.OpenFile(targetPath, os.O_RDWR, 0777)
-	if err == nil {
+	if err := ioutil.WriteFile(targetPath, []byte("hello"), 0644); err == nil {
 		t.Fatal("Should not be able to open a ro file as rw")
 	}
 }
diff --git a/mount/mounter_linux_test.go b/mount/mounter_linux_test.go
index 112ba337..9ba4857f 100644
--- a/mount/mounter_linux_test.go
+++ b/mount/mounter_linux_test.go
@@ -172,7 +172,7 @@ func validateMount(t *testing.T, mnt string, opts, optional, vfs string) {
 		if mi.Opts != "" {
 			for _, opt := range strings.Split(mi.Opts, ",") {
 				opt = clean(opt)
-				if !has(wantedOpts, opt) && !has(pOpts, opt) {
+				if !has(wantedOpts, opt) && !has(pOpts, opt) && opt != "relatime" {
 					t.Errorf("unexpected mount option %q, expected %q", opt, opts)
 				}
 				delete(wantedOpts, opt)
diff --git a/mount/sharedsubtree_linux_test.go b/mount/sharedsubtree_linux_test.go
index f775245a..e950230a 100644
--- a/mount/sharedsubtree_linux_test.go
+++ b/mount/sharedsubtree_linux_test.go
@@ -4,6 +4,7 @@ package mount
 
 import (
 	"errors"
+	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -340,10 +341,5 @@ func TestSubtreeUnbindable(t *testing.T) {
 }
 
 func createFile(path string) error {
-	f, err := os.Create(path)
-	if err != nil {
-		return err
-	}
-	f.WriteString("hello world!")
-	return f.Close()
+	return ioutil.WriteFile(path, []byte("hello"), 0666)
 }