diff --git a/graph_test.go b/graph_test.go
index 7e306c815e..ab4168026b 100644
--- a/graph_test.go
+++ b/graph_test.go
@@ -146,12 +146,12 @@ func TestMount(t *testing.T) {
 	if err := os.MkdirAll(rw, 0700); err != nil {
 		t.Fatal(err)
 	}
-	if err := graph.driver.Mount(image, tmp); err != nil {
+	if _, err := graph.driver.Get(image.ID); err != nil {
 		t.Fatal(err)
 	}
 	// FIXME: test for mount contents
 	defer func() {
-		if err := graph.driver.Unmount(tmp); err != nil {
+		if err := graph.driver.Cleanup(); err != nil {
 			t.Error(err)
 		}
 	}()
@@ -296,7 +296,7 @@ func tempGraph(t *testing.T) *Graph {
 	if err != nil {
 		t.Fatal(err)
 	}
-	backend, err := aufs.New()
+	backend, err := aufs.Init(path.Join(tmp, "driver"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/runtime.go b/runtime.go
index 75bae02934..b727cd65ae 100644
--- a/runtime.go
+++ b/runtime.go
@@ -6,6 +6,7 @@ import (
 	"database/sql"
 	"fmt"
 	"github.com/dotcloud/docker/archive"
+	_ "github.com/dotcloud/docker/aufs"
 	_ "github.com/dotcloud/docker/devmapper"
 	"github.com/dotcloud/docker/gograph"
 	"github.com/dotcloud/docker/graphdriver"
@@ -635,6 +636,7 @@ func NewRuntimeFromDirectory(config *DaemonConfig) (*Runtime, error) {
 	if err != nil {
 		return nil, err
 	}
+	utils.Debugf("Using graph driver %s", driver)
 
 	runtimeRepo := path.Join(config.Root, "containers")