diff --git a/util/afero_test.go b/util/afero_test.go
index a3b79f35..5f141f6a 100644
--- a/util/afero_test.go
+++ b/util/afero_test.go
@@ -157,7 +157,7 @@ func TestCopyDiskToFs1(t *testing.T) {
 
 		mmFs := afero.NewMemMapFs()
 		afs := &afero.Afero{Fs: mmFs} // wrap so that we're implementing ioutil
-		fs := &AferoFs{afs}
+		fs := &AferoFs{Afero: afs}
 
 		if err := CopyDiskToFs(fs, dir+f+"/", "/", false); err != nil {
 			t.Errorf("copying to fs failed: %+v", err)
@@ -218,7 +218,7 @@ func TestCopyDiskToFs2(t *testing.T) {
 
 		mmFs := afero.NewMemMapFs()
 		afs := &afero.Afero{Fs: mmFs} // wrap so that we're implementing ioutil
-		fs := &AferoFs{afs}
+		fs := &AferoFs{Afero: afs}
 
 		src := dir + f + "/"
 		dst := "/dest/"
@@ -282,7 +282,7 @@ func TestCopyDiskContentsToFs1(t *testing.T) {
 
 		mmFs := afero.NewMemMapFs()
 		afs := &afero.Afero{Fs: mmFs} // wrap so that we're implementing ioutil
-		fs := &AferoFs{afs}
+		fs := &AferoFs{Afero: afs}
 
 		if err := CopyDiskContentsToFs(fs, dir+f+"/", "/", false); err != nil {
 			t.Errorf("copying to fs failed: %+v", err)
diff --git a/util/fs.go b/util/fs.go
index cb5ddb9a..8c1daeca 100644
--- a/util/fs.go
+++ b/util/fs.go
@@ -25,13 +25,22 @@ import (
 
 // AferoFs is a simple wrapper to a file system to be used for standalone
 // deploys. This is basically a pass-through so that we fulfill the same
-// interface that the deploy mechanism uses. To use this, wrap it with the
-// implied field name, which will prevent `go vet` warnings, eg:
-// `fs := &util.AferoFs{Afero: afs}`. NOTE: This struct is here, since I don't
-// know where else to put it for now.
+// interface that the deploy mechanism uses. If you give it Scheme and Path
+// fields it will use those to build the URI. NOTE: This struct is here, since I
+// don't know where else to put it for now.
 type AferoFs struct {
 	*afero.Afero
+
+	Scheme string
+	Path   string
 }
 
 // URI returns the unique URI of this filesystem. It returns the root path.
-func (obj *AferoFs) URI() string { return fmt.Sprintf("%s://"+"/", obj.Name()) }
+func (obj *AferoFs) URI() string {
+	if obj.Scheme != "" {
+		// if obj.Path is not empty and doesn't start with a slash, then
+		// the first chunk will dissappear when being parsed with stdlib
+		return obj.Scheme + "://" + obj.Path
+	}
+	return fmt.Sprintf("%s://"+"/", obj.Name()) // old
+}