diff --git a/test/helper/aws.go b/helper/tests/aws.go
similarity index 98%
rename from test/helper/aws.go
rename to helper/tests/aws.go
index 76f27c8b1..e579bcde1 100644
--- a/test/helper/aws.go
+++ b/helper/tests/aws.go
@@ -1,4 +1,4 @@
-package helper
+package testshelper
 
 import (
 	"github.com/aws/aws-sdk-go/aws"
diff --git a/test/helper/core.go b/helper/tests/core.go
similarity index 98%
rename from test/helper/core.go
rename to helper/tests/core.go
index ca37a1119..05af712de 100644
--- a/test/helper/core.go
+++ b/helper/tests/core.go
@@ -1,4 +1,4 @@
-package helper
+package testshelper
 
 import (
 	"bytes"
diff --git a/test/provisioner/shell/provisioner_test.go b/provisioner/shell/provisioner_acc_test.go
similarity index 88%
rename from test/provisioner/shell/provisioner_test.go
rename to provisioner/shell/provisioner_acc_test.go
index 8cb801b90..0c4d40301 100644
--- a/test/provisioner/shell/provisioner_test.go
+++ b/provisioner/shell/provisioner_acc_test.go
@@ -1,11 +1,9 @@
-// +build integration
-
-package shell_integration
+package shell_test
 
 import (
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/packer/command"
-	testshelper "github.com/hashicorp/packer/test/helper"
+	"github.com/hashicorp/packer/helper/tests"
 	"os"
 	"path/filepath"
 	"testing"
diff --git a/test/provisioner/shell/test-fixtures/shell-provisioner.json b/provisioner/shell/test-fixtures/shell-provisioner.json
similarity index 100%
rename from test/provisioner/shell/test-fixtures/shell-provisioner.json
rename to provisioner/shell/test-fixtures/shell-provisioner.json