diff --git a/symlink/fs_test.go b/symlink/fs_test.go
index 24ffb1e..9d12041 100644
--- a/symlink/fs_test.go
+++ b/symlink/fs_test.go
@@ -3,248 +3,217 @@
 package symlink
 
 import (
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
 )
 
-func abs(t *testing.T, p string) string {
-	o, err := filepath.Abs(p)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return o
+type dirOrLink struct {
+	path   string
+	target string
 }
 
-func TestFollowSymLinkNormal(t *testing.T) {
-	link := "testdata/fs/a/d/c/data"
+func makeFs(tmpdir string, fs []dirOrLink) error {
+	for _, s := range fs {
+		s.path = filepath.Join(tmpdir, s.path)
+		if s.target == "" {
+			os.MkdirAll(s.path, 0755)
+			continue
+		}
+		if err := os.MkdirAll(filepath.Dir(s.path), 0755); err != nil {
+			return err
+		}
+		if err := os.Symlink(s.target, s.path); err != nil && !os.IsExist(err) {
+			return err
+		}
+	}
+	return nil
+}
 
-	rewrite, err := FollowSymlinkInScope(link, "testdata")
+func testSymlink(tmpdir, path, expected, scope string) error {
+	rewrite, err := FollowSymlinkInScope(filepath.Join(tmpdir, path), filepath.Join(tmpdir, scope))
+	if err != nil {
+		return err
+	}
+	expected, err = filepath.Abs(filepath.Join(tmpdir, expected))
+	if err != nil {
+		return err
+	}
+	if expected != rewrite {
+		return fmt.Errorf("Expected %q got %q", expected, rewrite)
+	}
+	return nil
+}
+
+func TestFollowSymlinkNormal(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkNormal")
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	if expected := abs(t, "testdata/b/c/data"); expected != rewrite {
-		t.Fatalf("Expected %s got %s", expected, rewrite)
+	defer os.RemoveAll(tmpdir)
+	if err := makeFs(tmpdir, []dirOrLink{{path: "testdata/fs/a/d", target: "/b"}}); err != nil {
+		t.Fatal(err)
+	}
+	if err := testSymlink(tmpdir, "testdata/fs/a/d/c/data", "testdata/b/c/data", "testdata"); err != nil {
+		t.Fatal(err)
 	}
 }
 
-func TestFollowSymLinkRelativePath(t *testing.T) {
-	link := "testdata/fs/i"
-
-	rewrite, err := FollowSymlinkInScope(link, "testdata")
+func TestFollowSymlinkRelativePath(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkRelativePath")
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	if expected := abs(t, "testdata/fs/a"); expected != rewrite {
-		t.Fatalf("Expected %s got %s", expected, rewrite)
+	defer os.RemoveAll(tmpdir)
+	if err := makeFs(tmpdir, []dirOrLink{{path: "testdata/fs/i", target: "a"}}); err != nil {
+		t.Fatal(err)
+	}
+	if err := testSymlink(tmpdir, "testdata/fs/i", "testdata/fs/a", "testdata"); err != nil {
+		t.Fatal(err)
 	}
 }
 
-func TestFollowSymLinkUnderLinkedDir(t *testing.T) {
-	dir, err := ioutil.TempDir("", "docker-fs-test")
+func TestFollowSymlinkUnderLinkedDir(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkUnderLinkedDir")
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.RemoveAll(dir)
-
-	os.Mkdir(filepath.Join(dir, "realdir"), 0700)
-	os.Symlink("realdir", filepath.Join(dir, "linkdir"))
-
-	linkDir := filepath.Join(dir, "linkdir", "foo")
-	dirUnderLinkDir := filepath.Join(dir, "linkdir", "foo", "bar")
-	os.MkdirAll(dirUnderLinkDir, 0700)
-
-	rewrite, err := FollowSymlinkInScope(dirUnderLinkDir, linkDir)
-	if err != nil {
+	defer os.RemoveAll(tmpdir)
+	if err := makeFs(tmpdir, []dirOrLink{
+		{path: "linkdir", target: "realdir"},
+		{path: "linkdir/foo/bar"},
+	}); err != nil {
 		t.Fatal(err)
 	}
-
-	if rewrite != dirUnderLinkDir {
-		t.Fatalf("Expected %s got %s", dirUnderLinkDir, rewrite)
+	if err := testSymlink(tmpdir, "linkdir/foo/bar", "linkdir/foo/bar", "linkdir/foo"); err != nil {
+		t.Fatal(err)
 	}
 }
 
-func TestFollowSymLinkRandomString(t *testing.T) {
+func TestFollowSymlinkRandomString(t *testing.T) {
 	if _, err := FollowSymlinkInScope("toto", "testdata"); err == nil {
 		t.Fatal("Random string should fail but didn't")
 	}
 }
 
-func TestFollowSymLinkLastLink(t *testing.T) {
-	link := "testdata/fs/a/d"
-
-	rewrite, err := FollowSymlinkInScope(link, "testdata")
+func TestFollowSymlinkLastLink(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkLastLink")
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	if expected := abs(t, "testdata/b"); expected != rewrite {
-		t.Fatalf("Expected %s got %s", expected, rewrite)
+	defer os.RemoveAll(tmpdir)
+	if err := makeFs(tmpdir, []dirOrLink{{path: "testdata/fs/a/d", target: "/b"}}); err != nil {
+		t.Fatal(err)
+	}
+	if err := testSymlink(tmpdir, "testdata/fs/a/d", "testdata/b", "testdata"); err != nil {
+		t.Fatal(err)
 	}
 }
 
-func TestFollowSymLinkRelativeLink(t *testing.T) {
-	link := "testdata/fs/a/e/c/data"
-
-	rewrite, err := FollowSymlinkInScope(link, "testdata")
+func TestFollowSymlinkRelativeLink(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkRelativeLink")
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	if expected := abs(t, "testdata/fs/b/c/data"); expected != rewrite {
-		t.Fatalf("Expected %s got %s", expected, rewrite)
+	defer os.RemoveAll(tmpdir)
+	if err := makeFs(tmpdir, []dirOrLink{{path: "testdata/fs/a/e", target: "../b"}}); err != nil {
+		t.Fatal(err)
+	}
+	if err := testSymlink(tmpdir, "testdata/fs/a/e/c/data", "testdata/fs/b/c/data", "testdata"); err != nil {
+		t.Fatal(err)
 	}
 }
 
-func TestFollowSymLinkRelativeLinkScope(t *testing.T) {
+func TestFollowSymlinkRelativeLinkScope(t *testing.T) {
+	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkRelativeLinkScope")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tmpdir)
+
+	if err := makeFs(tmpdir, []dirOrLink{{path: "testdata/fs/a/f", target: "../../../../test"}}); err != nil {
+		t.Fatal(err)
+	}
 	// avoid letting symlink f lead us out of the "testdata" scope
 	// we don't normalize because symlink f is in scope and there is no
 	// information leak
-	{
-		link := "testdata/fs/a/f"
-
-		rewrite, err := FollowSymlinkInScope(link, "testdata")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if expected := abs(t, "testdata/test"); expected != rewrite {
-			t.Fatalf("Expected %s got %s", expected, rewrite)
-		}
+	if err := testSymlink(tmpdir, "testdata/fs/a/f", "testdata/test", "testdata"); err != nil {
+		t.Fatal(err)
 	}
-
 	// avoid letting symlink f lead us out of the "testdata/fs" scope
 	// we don't normalize because symlink f is in scope and there is no
 	// information leak
-	{
-		link := "testdata/fs/a/f"
-
-		rewrite, err := FollowSymlinkInScope(link, "testdata/fs")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if expected := abs(t, "testdata/fs/test"); expected != rewrite {
-			t.Fatalf("Expected %s got %s", expected, rewrite)
-		}
+	if err := testSymlink(tmpdir, "testdata/fs/a/f", "testdata/fs/test", "testdata/fs"); err != nil {
+		t.Fatal(err)
 	}
 
 	// avoid letting symlink g (pointed at by symlink h) take out of scope
 	// TODO: we should probably normalize to scope here because ../[....]/root
 	// is out of scope and we leak information
-	{
-		link := "testdata/fs/b/h"
-
-		rewrite, err := FollowSymlinkInScope(link, "testdata")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if expected := abs(t, "testdata/root"); expected != rewrite {
-			t.Fatalf("Expected %s got %s", expected, rewrite)
-		}
+	if err := makeFs(tmpdir, []dirOrLink{
+		{path: "testdata/fs/b/h", target: "../g"},
+		{path: "testdata/fs/g", target: "../../../../../../../../../../../../root"},
+	}); err != nil {
+		t.Fatal(err)
+	}
+	if err := testSymlink(tmpdir, "testdata/fs/b/h", "testdata/root", "testdata"); err != nil {
+		t.Fatal(err)
 	}
 
 	// avoid letting allowing symlink e lead us to ../b
 	// normalize to the "testdata/fs/a"
-	{
-		link := "testdata/fs/a/e"
-
-		rewrite, err := FollowSymlinkInScope(link, "testdata/fs/a")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if expected := abs(t, "testdata/fs/a"); expected != rewrite {
-			t.Fatalf("Expected %s got %s", expected, rewrite)
-		}
+	if err := makeFs(tmpdir, []dirOrLink{
+		{path: "testdata/fs/a/e", target: "../b"},
+	}); err != nil {
+		t.Fatal(err)
+	}
+	if err := testSymlink(tmpdir, "testdata/fs/a/e", "testdata/fs/a/b", "testdata/fs/a"); err != nil {
+		t.Fatal(err)
 	}
 
 	// avoid letting symlink -> ../directory/file escape from scope
 	// normalize to "testdata/fs/j"
-	{
-		link := "testdata/fs/j/k"
-
-		rewrite, err := FollowSymlinkInScope(link, "testdata/fs/j")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if expected := abs(t, "testdata/fs/j"); expected != rewrite {
-			t.Fatalf("Expected %s got %s", expected, rewrite)
-		}
+	if err := makeFs(tmpdir, []dirOrLink{{path: "testdata/fs/j/k", target: "../i/a"}}); err != nil {
+		t.Fatal(err)
+	}
+	if err := testSymlink(tmpdir, "testdata/fs/j/k", "testdata/fs/j/i/a", "testdata/fs/j"); err != nil {
+		t.Fatal(err)
 	}
 
 	// make sure we don't allow escaping to /
 	// normalize to dir
-	{
-		dir, err := ioutil.TempDir("", "docker-fs-test")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer os.RemoveAll(dir)
-
-		linkFile := filepath.Join(dir, "foo")
-		os.Mkdir(filepath.Join(dir, ""), 0700)
-		os.Symlink("/", linkFile)
-
-		rewrite, err := FollowSymlinkInScope(linkFile, dir)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if rewrite != dir {
-			t.Fatalf("Expected %s got %s", dir, rewrite)
-		}
+	if err := makeFs(tmpdir, []dirOrLink{{path: "foo", target: "/"}}); err != nil {
+		t.Fatal(err)
+	}
+	if err := testSymlink(tmpdir, "foo", "", ""); err != nil {
+		t.Fatal(err)
 	}
 
 	// make sure we don't allow escaping to /
 	// normalize to dir
-	{
-		dir, err := ioutil.TempDir("", "docker-fs-test")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer os.RemoveAll(dir)
-
-		linkFile := filepath.Join(dir, "foo")
-		os.Mkdir(filepath.Join(dir, ""), 0700)
-		os.Symlink("/../../", linkFile)
-
-		rewrite, err := FollowSymlinkInScope(linkFile, dir)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if rewrite != dir {
-			t.Fatalf("Expected %s got %s", dir, rewrite)
-		}
+	if err := makeFs(filepath.Join(tmpdir, "dir", "subdir"), []dirOrLink{{path: "foo", target: "/../../"}}); err != nil {
+		t.Fatal(err)
+	}
+	if err := testSymlink(tmpdir, "foo", "", ""); err != nil {
+		t.Fatal(err)
 	}
 
 	// make sure we stay in scope without leaking information
 	// this also checks for escaping to /
 	// normalize to dir
-	{
-		dir, err := ioutil.TempDir("", "docker-fs-test")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer os.RemoveAll(dir)
+	if err := makeFs(filepath.Join(tmpdir, "dir", "subdir"), []dirOrLink{{path: "foo", target: "../../"}}); err != nil {
+		t.Fatal(err)
+	}
+	if err := testSymlink(tmpdir, "foo", "", ""); err != nil {
+		t.Fatal(err)
+	}
 
-		linkFile := filepath.Join(dir, "foo")
-		os.Mkdir(filepath.Join(dir, ""), 0700)
-		os.Symlink("../../", linkFile)
-
-		rewrite, err := FollowSymlinkInScope(linkFile, dir)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if rewrite != dir {
-			t.Fatalf("Expected %s got %s", dir, rewrite)
-		}
+	if err := makeFs(tmpdir, []dirOrLink{{path: "bar/foo", target: "baz/target"}}); err != nil {
+		t.Fatal(err)
+	}
+	if err := testSymlink(tmpdir, "bar/foo", "bar/baz/target", ""); err != nil {
+		t.Fatal(err)
 	}
 }
diff --git a/symlink/testdata/fs/a/d b/symlink/testdata/fs/a/d
deleted file mode 120000
index 28abc96..0000000
--- a/symlink/testdata/fs/a/d
+++ /dev/null
@@ -1 +0,0 @@
-/b
\ No newline at end of file
diff --git a/symlink/testdata/fs/a/e b/symlink/testdata/fs/a/e
deleted file mode 120000
index 42532fe..0000000
--- a/symlink/testdata/fs/a/e
+++ /dev/null
@@ -1 +0,0 @@
-../b
\ No newline at end of file
diff --git a/symlink/testdata/fs/a/f b/symlink/testdata/fs/a/f
deleted file mode 120000
index 21de7ed..0000000
--- a/symlink/testdata/fs/a/f
+++ /dev/null
@@ -1 +0,0 @@
-../../../../test
\ No newline at end of file
diff --git a/symlink/testdata/fs/b/h b/symlink/testdata/fs/b/h
deleted file mode 120000
index 24387a6..0000000
--- a/symlink/testdata/fs/b/h
+++ /dev/null
@@ -1 +0,0 @@
-../g
\ No newline at end of file
diff --git a/symlink/testdata/fs/g b/symlink/testdata/fs/g
deleted file mode 120000
index 0ce5de0..0000000
--- a/symlink/testdata/fs/g
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../../../../root
\ No newline at end of file
diff --git a/symlink/testdata/fs/i b/symlink/testdata/fs/i
deleted file mode 120000
index 2e65efe..0000000
--- a/symlink/testdata/fs/i
+++ /dev/null
@@ -1 +0,0 @@
-a
\ No newline at end of file
diff --git a/symlink/testdata/fs/j/k b/symlink/testdata/fs/j/k
deleted file mode 120000
index f559e8f..0000000
--- a/symlink/testdata/fs/j/k
+++ /dev/null
@@ -1 +0,0 @@
-../i/a
\ No newline at end of file