diff --git a/openstack/orchestration/v1/buildinfo/testing/doc.go b/openstack/orchestration/v1/buildinfo/testing/doc.go
new file mode 100644
index 0000000..7603f83
--- /dev/null
+++ b/openstack/orchestration/v1/buildinfo/testing/doc.go
@@ -0,0 +1 @@
+package testing
diff --git a/openstack/orchestration/v1/buildinfo/fixtures.go b/openstack/orchestration/v1/buildinfo/testing/fixtures.go
similarity index 83%
rename from openstack/orchestration/v1/buildinfo/fixtures.go
rename to openstack/orchestration/v1/buildinfo/testing/fixtures.go
index 87bc3ec..c240d5f 100644
--- a/openstack/orchestration/v1/buildinfo/fixtures.go
+++ b/openstack/orchestration/v1/buildinfo/testing/fixtures.go
@@ -1,22 +1,21 @@
-// +build fixtures
-
-package buildinfo
+package testing
 
 import (
 	"fmt"
 	"net/http"
 	"testing"
 
+	"github.com/gophercloud/gophercloud/openstack/orchestration/v1/buildinfo"
 	th "github.com/gophercloud/gophercloud/testhelper"
 	fake "github.com/gophercloud/gophercloud/testhelper/client"
 )
 
 // GetExpected represents the expected object from a Get request.
-var GetExpected = &BuildInfo{
-	API: Revision{
+var GetExpected = &buildinfo.BuildInfo{
+	API: buildinfo.Revision{
 		Revision: "2.4.5",
 	},
-	Engine: Revision{
+	Engine: buildinfo.Revision{
 		Revision: "1.2.1",
 	},
 }
diff --git a/openstack/orchestration/v1/buildinfo/requests_test.go b/openstack/orchestration/v1/buildinfo/testing/requests_test.go
similarity index 69%
rename from openstack/orchestration/v1/buildinfo/requests_test.go
rename to openstack/orchestration/v1/buildinfo/testing/requests_test.go
index 18d15b3..bd2e164 100644
--- a/openstack/orchestration/v1/buildinfo/requests_test.go
+++ b/openstack/orchestration/v1/buildinfo/testing/requests_test.go
@@ -1,8 +1,9 @@
-package buildinfo
+package testing
 
 import (
 	"testing"
 
+	"github.com/gophercloud/gophercloud/openstack/orchestration/v1/buildinfo"
 	th "github.com/gophercloud/gophercloud/testhelper"
 	fake "github.com/gophercloud/gophercloud/testhelper/client"
 )
@@ -12,7 +13,7 @@
 	defer th.TeardownHTTP()
 	HandleGetSuccessfully(t, GetOutput)
 
-	actual, err := Get(fake.ServiceClient()).Extract()
+	actual, err := buildinfo.Get(fake.ServiceClient()).Extract()
 	th.AssertNoErr(t, err)
 
 	expected := GetExpected