diff --git a/garnet/go/src/syslog_tests/BUILD.gn b/garnet/go/src/syslog_tests/BUILD.gn
deleted file mode 100644
index 1f4724f..0000000
--- a/garnet/go/src/syslog_tests/BUILD.gn
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/go/go_library.gni")
-import("//build/go/go_test.gni")
-import("//build/package.gni")
-import("//build/testing/environments.gni")
-
-go_library("syslog_tests_lib") {
-  name = "syslog_tests"
-  deps = [
-    "//garnet/public/lib/syslog/go/src/syslog",
-  ]
-}
-
-go_test("syslog_go_tests") {
-  gopackage = "syslog_tests"
-  deps = [
-    ":syslog_tests_lib",
-  ]
-}
-
-package("syslog_gotests") {
-  testonly = true
-
-  deps = [
-    ":syslog_go_tests",
-  ]
-  tests = [
-    {
-      name = "syslog_go_tests"
-      environments = basic_envs
-    },
-  ]
-}
diff --git a/garnet/packages/tests/syslog b/garnet/packages/tests/syslog
index 0380a83..887c3b5 100644
--- a/garnet/packages/tests/syslog
+++ b/garnet/packages/tests/syslog
@@ -1,6 +1,6 @@
 {
     "packages": [
         "//garnet/public/lib/syslog/cpp:tests",
-        "//garnet/go/src/syslog_tests:syslog_gotests"
+        "//garnet/public/lib/syslog/go/src/syslog:syslog_gotests"
     ]
 }
diff --git a/garnet/public/lib/syslog/go/src/syslog/BUILD.gn b/garnet/public/lib/syslog/go/src/syslog/BUILD.gn
index 33c3c0b..2536698 100644
--- a/garnet/public/lib/syslog/go/src/syslog/BUILD.gn
+++ b/garnet/public/lib/syslog/go/src/syslog/BUILD.gn
@@ -3,7 +3,10 @@
 # found in the LICENSE file.
 
 import("//build/go/go_library.gni")
+import("//build/go/go_test.gni")
 import("//build/go/toolchain.gni")
+import("//build/package.gni")
+import("//build/testing/environments.gni")
 
 go_library("syslog") {
   name = "syslog"
@@ -12,3 +15,25 @@
     "//zircon/public/fidl/fuchsia-logger($go_toolchain)",
   ]
 }
+
+go_test("syslog_logger_test") {
+  gopackage = "syslog/logger"
+  deps = [
+    ":syslog",
+  ]
+}
+
+package("syslog_gotests") {
+  testonly = true
+
+  deps = [
+    ":syslog_logger_test",
+  ]
+
+  tests = [
+    {
+      name = "syslog_logger_test"
+      environments = basic_envs
+    },
+  ]
+}
diff --git a/garnet/go/src/syslog_tests/syslog_test.go b/garnet/public/lib/syslog/go/src/syslog/logger/logger_test.go
similarity index 99%
rename from garnet/go/src/syslog_tests/syslog_test.go
rename to garnet/public/lib/syslog/go/src/syslog/logger/logger_test.go
index 1fca596..e081b12 100644
--- a/garnet/go/src/syslog_tests/syslog_test.go
+++ b/garnet/public/lib/syslog/go/src/syslog/logger/logger_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package main
+package logger_test
 
 import (
 	"bytes"