diff --git a/.travis.yml b/.travis.yml
index d8ed19f..4b317c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,7 @@
 - go get golang.org/x/crypto/ssh
 - go get -v -tags 'fixtures acceptance' ./...
 go:
-- 1.4
-- 1.5
+- 1.6
 - tip
 env:
   global:
diff --git a/acceptance/openstack/blockstorage/v1/pkg.go b/acceptance/openstack/blockstorage/v1/pkg.go
new file mode 100644
index 0000000..4efa6fb
--- /dev/null
+++ b/acceptance/openstack/blockstorage/v1/pkg.go
@@ -0,0 +1,2 @@
+// Package v1 contains openstack cinder acceptance tests
+package v1
diff --git a/acceptance/openstack/compute/v2/pkg.go b/acceptance/openstack/compute/v2/pkg.go
index bb158c3..a57c1e7 100644
--- a/acceptance/openstack/compute/v2/pkg.go
+++ b/acceptance/openstack/compute/v2/pkg.go
@@ -1,3 +1,2 @@
-// The v2 package contains acceptance tests for the Openstack Compute V2 service.
-
+// Package v2 package contains acceptance tests for the Openstack Compute V2 service.
 package v2
diff --git a/acceptance/openstack/objectstorage/v1/pkg.go b/acceptance/openstack/objectstorage/v1/pkg.go
new file mode 100644
index 0000000..b7b1f99
--- /dev/null
+++ b/acceptance/openstack/objectstorage/v1/pkg.go
@@ -0,0 +1 @@
+package v1
diff --git a/acceptance/openstack/orchestration/v1/pkg.go b/acceptance/openstack/orchestration/v1/pkg.go
new file mode 100644
index 0000000..b7b1f99
--- /dev/null
+++ b/acceptance/openstack/orchestration/v1/pkg.go
@@ -0,0 +1 @@
+package v1