3 files changed, 27 insertions, 14 deletions
diff --git a/internal/serving/disk/local/serving.go b/internal/serving/disk/local/serving.go
new file mode 100644
index 00000000..230a71da
--- /dev/null
+++ b/internal/serving/disk/local/serving.go
@@ -0,0 +1,16 @@
+package local
+
+import (
+	"gitlab.com/gitlab-org/gitlab-pages/internal/serving"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/disk"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/vfs"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/vfs/local"
+)
+
+var instance = disk.New(vfs.Instrumented(&local.VFS{}, "local"))
+
+// Instance returns a serving instance that is capable of reading files
+// from the disk
+func Instance() serving.Serving {
+	return instance
+}
diff --git a/internal/serving/disk/serving_test.go b/internal/serving/disk/local/serving_test.go
index 60fb4180..60f01acd 100644
--- a/internal/serving/disk/serving_test.go
+++ b/internal/serving/disk/local/serving_test.go
@@ -1,4 +1,4 @@
-package disk
+package local
 
 import (
 	"io/ioutil"
@@ -44,5 +44,5 @@ var chdirSet = false
 
 func setUpTests(t testing.TB) func() {
 	t.Helper()
-	return testhelpers.ChdirInPath(t, "../../../shared/pages", &chdirSet)
+	return testhelpers.ChdirInPath(t, "../../../../shared/pages", &chdirSet)
 }
diff --git a/internal/serving/disk/serving.go b/internal/serving/disk/serving.go
index a38124ef..f95f983c 100644
--- a/internal/serving/disk/serving.go
+++ b/internal/serving/disk/serving.go
@@ -4,17 +4,9 @@ import (
 	"gitlab.com/gitlab-org/gitlab-pages/internal/httperrors"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/vfs"
-	"gitlab.com/gitlab-org/gitlab-pages/internal/vfs/local"
 	"gitlab.com/gitlab-org/gitlab-pages/metrics"
 )
 
-var disk = &Disk{
-	reader: Reader{
-		fileSizeMetric: metrics.DiskServingFileSize,
-		vfs:            vfs.Instrumented(local.VFS{}, "disk"),
-	},
-}
-
 // Disk describes a disk access serving
 type Disk struct {
 	reader Reader
@@ -36,8 +28,13 @@ func (s *Disk) ServeNotFoundHTTP(h serving.Handler) {
 	httperrors.Serve404(h.Writer)
 }
 
-// Instance returns a serving instance that is capable of reading files
-// from the disk
-func Instance() serving.Serving {
-	return disk
+// New returns a serving instance that is capable of reading files
+// from the VFS
+func New(vfs vfs.VFS) serving.Serving {
+	return &Disk{
+		reader: Reader{
+			fileSizeMetric: metrics.DiskServingFileSize,
+			vfs:            vfs,
+		},
+	}
 }