diff --git a/acceptance/rackspace/networking/v2/networks_test.go b/acceptance/rackspace/compute/v2/networks_test.go
similarity index 67%
rename from acceptance/rackspace/networking/v2/networks_test.go
rename to acceptance/rackspace/compute/v2/networks_test.go
index 6621ded..e8fc4d3 100644
--- a/acceptance/rackspace/networking/v2/networks_test.go
+++ b/acceptance/rackspace/compute/v2/networks_test.go
@@ -1,4 +1,4 @@
-// +build acceptance rackspace networking v2
+// +build acceptance rackspace
 
 package v2
 
@@ -6,24 +6,25 @@
 	"testing"
 
 	"github.com/rackspace/gophercloud/pagination"
-	"github.com/rackspace/gophercloud/rackspace/networking/v2/networks"
+	"github.com/rackspace/gophercloud/rackspace/compute/v2/networks"
 	th "github.com/rackspace/gophercloud/testhelper"
 )
 
 func TestNetworks(t *testing.T) {
-	Setup(t)
-	defer Teardown()
+	client, err := newClient()
+	th.AssertNoErr(t, err)
 
 	// Create a network
-	n, err := networks.Create(Client, networks.CreateOpts{Label: "sample_network", CIDR: "172.20.0.0/24"}).Extract()
+	n, err := networks.Create(client, networks.CreateOpts{Label: "sample_network", CIDR: "172.20.0.0/24"}).Extract()
 	th.AssertNoErr(t, err)
-	defer networks.Delete(Client, n.ID)
+	t.Logf("Created network: %+v\n", n)
+	defer networks.Delete(client, n.ID)
 	th.AssertEquals(t, n.Label, "sample_network")
 	th.AssertEquals(t, n.CIDR, "172.20.0.0/24")
 	networkID := n.ID
 
 	// List networks
-	pager := networks.List(Client)
+	pager := networks.List(client)
 	err = pager.EachPage(func(page pagination.Page) (bool, error) {
 		t.Logf("--- Page ---")
 
@@ -43,9 +44,10 @@
 	if networkID == "" {
 		t.Fatalf("In order to retrieve a network, the NetworkID must be set")
 	}
-	n, err = networks.Get(Client, networkID).Extract()
+	n, err = networks.Get(client, networkID).Extract()
+	t.Logf("Retrieved Network: %+v\n", n)
 	th.AssertNoErr(t, err)
-	th.AssertDeepEquals(t, n.CIDR, "172.20.0.0/24")
+	th.AssertEquals(t, n.CIDR, "172.20.0.0/24")
 	th.AssertEquals(t, n.Label, "sample_network")
 	th.AssertEquals(t, n.ID, networkID)
 }
diff --git a/acceptance/rackspace/compute/v2/virtualinterfaces_test.go b/acceptance/rackspace/compute/v2/virtualinterfaces_test.go
new file mode 100644
index 0000000..446d3a3
--- /dev/null
+++ b/acceptance/rackspace/compute/v2/virtualinterfaces_test.go
@@ -0,0 +1,53 @@
+// +build acceptance rackspace
+
+package v2
+
+import (
+  "testing"
+
+  "github.com/rackspace/gophercloud/pagination"
+  "github.com/rackspace/gophercloud/rackspace/compute/v2/networks"
+  "github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces"
+  th "github.com/rackspace/gophercloud/testhelper"
+)
+
+func TestVirtualInterfaces(t *testing.T) {
+  client, err := newClient()
+  th.AssertNoErr(t, err)
+
+  // Create a server
+  server := createServer(t, client)
+  t.Logf("Created Server: %v\n", server)
+  defer deleteServer(t, client, server)
+  serverID := server.ID
+
+  // Create a network
+  n, err := networks.Create(client, networks.CreateOpts{Label: "sample_network", CIDR: "172.20.0.0/24"}).Extract()
+  th.AssertNoErr(t, err)
+  t.Logf("Created Network: %v\n", n)
+  defer networks.Delete(client, n.ID)
+  networkID := n.ID
+
+  // Create a virtual interface
+  vi, err := virtualinterfaces.Create(client, serverID, networkID).Extract()
+  th.AssertNoErr(t, err)
+  t.Logf("Created virtual interface: %+v\n", vi)
+  defer virtualinterfaces.Delete(client, serverID, vi.ID)
+
+  // List virtual interfaces
+  pager := virtualinterfaces.List(client, serverID)
+  err = pager.EachPage(func(page pagination.Page) (bool, error) {
+    t.Logf("--- Page ---")
+
+    virtualinterfacesList, err := virtualinterfaces.ExtractVirtualInterfaces(page)
+    th.AssertNoErr(t, err)
+
+    for _, vi := range virtualinterfacesList {
+      t.Logf("Virtual Interface: ID [%s] MAC Address [%s] IP Addresses [%v]",
+        vi.ID, vi.MACAddress, vi.IPAddresses)
+    }
+
+    return true, nil
+  })
+  th.CheckNoErr(t, err)
+}
diff --git a/acceptance/rackspace/networking/v2/common_test.go b/acceptance/rackspace/networking/v2/common_test.go
deleted file mode 100644
index 6356e96..0000000
--- a/acceptance/rackspace/networking/v2/common_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// +build acceptance rackspace networking v2
-
-package v2
-
-import (
-	"os"
-	"testing"
-
-	"github.com/rackspace/gophercloud"
-	"github.com/rackspace/gophercloud/rackspace"
-	th "github.com/rackspace/gophercloud/testhelper"
-)
-
-var Client *gophercloud.ServiceClient
-
-func NewClient() (*gophercloud.ServiceClient, error) {
-	opts, err := rackspace.AuthOptionsFromEnv()
-	if err != nil {
-		return nil, err
-	}
-
-	provider, err := rackspace.AuthenticatedClient(opts)
-	if err != nil {
-		return nil, err
-	}
-
-	return rackspace.NewNetworkV2(provider, gophercloud.EndpointOpts{
-		Region: os.Getenv("RS_REGION_NAME"),
-	})
-}
-
-func Setup(t *testing.T) {
-	client, err := NewClient()
-	th.AssertNoErr(t, err)
-	Client = client
-}
-
-func Teardown() {
-	Client = nil
-}
diff --git a/acceptance/rackspace/networking/v2/virtualinterfaces_test.go b/acceptance/rackspace/networking/v2/virtualinterfaces_test.go
deleted file mode 100644
index 8b08c56..0000000
--- a/acceptance/rackspace/networking/v2/virtualinterfaces_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// +build acceptance rackspace networking v2
-
-package v2
-
-import (
-  "testing"
-
-  osServers "github.com/rackspace/gophercloud/openstack/compute/v2/servers"
-  "github.com/rackspace/gophercloud/pagination"
-  "github.com/rackspace/gophercloud/rackspace/networking/v2/networks"
-  "github.com/rackspace/gophercloud/rackspace/compute/v2/servers"
-  "github.com/rackspace/gophercloud/rackspace/networking/v2/virtualinterfaces"
-  th "github.com/rackspace/gophercloud/testhelper"
-)
-
-func TestVirtualInterfaces(t *testing.T) {
-  Setup(t)
-  defer Teardown()
-
-  // Get a Server
-  var serverID string
-  pager := servers.List(Client, osServers.ListOpts{Limit:1})
-  err := pager.EachPage(func(page pagination.Page) (bool, error) {
-    servers, err := servers.ExtractServers(page)
-    if err != nil {
-      return false, err
-    }
-    serverID = servers[0].ID
-    return true, nil
-  })
-  th.AssertNoErr(t, err)
-
-  t.Logf("ServerID: %s", serverID)
-
-  // Create a network
-  n, err := networks.Create(Client, networks.CreateOpts{Label: "sample_network", CIDR: "172.20.0.0/24"}).Extract()
-  th.AssertNoErr(t, err)
-  defer networks.Delete(Client, n.ID)
-  networkID := n.ID
-
-  t.Logf("NetworkID: %s", networkID)
-
-  // Create a virtual interface
-  vi, err := virtualinterfaces.Create(Client, serverID, networkID).Extract()
-  th.AssertNoErr(t, err)
-  t.Logf("Created virtual interface: %+v\n", vi)
-  defer virtualinterfaces.Delete(Client, serverID, vi.ID)
-
-  // List virtual interfaces
-  pager = virtualinterfaces.List(Client, serverID)
-  err = pager.EachPage(func(page pagination.Page) (bool, error) {
-    t.Logf("--- Page ---")
-
-    virtualinterfacesList, err := virtualinterfaces.ExtractVirtualInterfaces(page)
-    th.AssertNoErr(t, err)
-
-    for _, vi := range virtualinterfacesList {
-      t.Logf("Virtual Interface: ID [%s] MAC Address [%s] IP Addresses [%v]",
-        vi.ID, vi.MACAddress, vi.IPAddresses)
-    }
-
-    return true, nil
-  })
-  th.CheckNoErr(t, err)
-}
diff --git a/rackspace/networking/v2/networks/requests.go b/rackspace/compute/v2/networks/requests.go
similarity index 100%
rename from rackspace/networking/v2/networks/requests.go
rename to rackspace/compute/v2/networks/requests.go
diff --git a/rackspace/networking/v2/networks/requests_test.go b/rackspace/compute/v2/networks/requests_test.go
similarity index 96%
rename from rackspace/networking/v2/networks/requests_test.go
rename to rackspace/compute/v2/networks/requests_test.go
index 441c450..895dc83 100644
--- a/rackspace/networking/v2/networks/requests_test.go
+++ b/rackspace/compute/v2/networks/requests_test.go
@@ -153,8 +153,6 @@
 		w.WriteHeader(http.StatusNoContent)
 	})
 
-	s := fake.ServiceClient()
-	t.Logf("fake.serviceclient: %+v\n", s)
-	res := Delete(s, "4e8e5957-649f-477b-9e5b-f1f75b21c03c")
+	res := Delete(fake.ServiceClient(), "4e8e5957-649f-477b-9e5b-f1f75b21c03c")
 	th.AssertNoErr(t, res.Err)
 }
diff --git a/rackspace/networking/v2/networks/results.go b/rackspace/compute/v2/networks/results.go
similarity index 100%
rename from rackspace/networking/v2/networks/results.go
rename to rackspace/compute/v2/networks/results.go
diff --git a/rackspace/networking/v2/networks/urls.go b/rackspace/compute/v2/networks/urls.go
similarity index 100%
rename from rackspace/networking/v2/networks/urls.go
rename to rackspace/compute/v2/networks/urls.go
diff --git a/rackspace/networking/v2/networks/urls_test.go b/rackspace/compute/v2/networks/urls_test.go
similarity index 100%
rename from rackspace/networking/v2/networks/urls_test.go
rename to rackspace/compute/v2/networks/urls_test.go
diff --git a/rackspace/networking/v2/virtualinterfaces/requests.go b/rackspace/compute/v2/virtualinterfaces/requests.go
similarity index 100%
rename from rackspace/networking/v2/virtualinterfaces/requests.go
rename to rackspace/compute/v2/virtualinterfaces/requests.go
diff --git a/rackspace/networking/v2/virtualinterfaces/requests_test.go b/rackspace/compute/v2/virtualinterfaces/requests_test.go
similarity index 100%
rename from rackspace/networking/v2/virtualinterfaces/requests_test.go
rename to rackspace/compute/v2/virtualinterfaces/requests_test.go
diff --git a/rackspace/networking/v2/virtualinterfaces/results.go b/rackspace/compute/v2/virtualinterfaces/results.go
similarity index 100%
rename from rackspace/networking/v2/virtualinterfaces/results.go
rename to rackspace/compute/v2/virtualinterfaces/results.go
diff --git a/rackspace/networking/v2/virtualinterfaces/urls.go b/rackspace/compute/v2/virtualinterfaces/urls.go
similarity index 100%
rename from rackspace/networking/v2/virtualinterfaces/urls.go
rename to rackspace/compute/v2/virtualinterfaces/urls.go
diff --git a/rackspace/networking/v2/virtualinterfaces/urls_test.go b/rackspace/compute/v2/virtualinterfaces/urls_test.go
similarity index 100%
rename from rackspace/networking/v2/virtualinterfaces/urls_test.go
rename to rackspace/compute/v2/virtualinterfaces/urls_test.go