diff --git a/service/test/common_test.go b/service/test/common_test.go
index 9000c53c..892d5212 100644
--- a/service/test/common_test.go
+++ b/service/test/common_test.go
@@ -1,4 +1,4 @@
-package servicetest
+package service_test
 
 import (
 	"fmt"
diff --git a/service/test/integration1_test.go b/service/test/integration1_test.go
index 498f4ef2..8c982d28 100644
--- a/service/test/integration1_test.go
+++ b/service/test/integration1_test.go
@@ -1,4 +1,4 @@
-package servicetest
+package service_test
 
 import (
 	"fmt"
diff --git a/service/test/integration2_test.go b/service/test/integration2_test.go
index 3f2ecdc7..38cd2052 100644
--- a/service/test/integration2_test.go
+++ b/service/test/integration2_test.go
@@ -1,4 +1,4 @@
-package servicetest
+package service_test
 
 import (
 	"flag"
diff --git a/service/test/variables_test.go b/service/test/variables_test.go
index 95028c7e..133678e5 100644
--- a/service/test/variables_test.go
+++ b/service/test/variables_test.go
@@ -1,4 +1,4 @@
-package servicetest
+package service_test
 
 import (
 	"fmt"
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/derekparker/delve/pkg/proc"
-	"github.com/derekparker/delve/service/api"
 	"github.com/derekparker/delve/pkg/target"
+	"github.com/derekparker/delve/service/api"
 
 	protest "github.com/derekparker/delve/pkg/proc/test"
 )