diff --git a/Makefile b/Makefile
index 1623c84..40147e5 100644
--- a/Makefile
+++ b/Makefile
@@ -15,13 +15,11 @@ lint:
 
 test:
 	TEST_FREELIST_TYPE=hashmap go test -timeout 20m -v -coverprofile cover.out -covermode atomic
-	# Note: gets "program not an importable package" in out of path builds
 	TEST_FREELIST_TYPE=hashmap go test -v ./cmd/bbolt
 
 	@echo "array freelist test"
 
 	@TEST_FREELIST_TYPE=array go test -timeout 20m -v -coverprofile cover.out -covermode atomic
-	# Note: gets "program not an importable package" in out of path builds
 	@TEST_FREELIST_TYPE=array go test -v ./cmd/bbolt
 
 .PHONY: race fmt test lint
diff --git a/cmd/bbolt/main_test b/cmd/bbolt/main_test.go
similarity index 99%
rename from cmd/bbolt/main_test
rename to cmd/bbolt/main_test.go
index 73da2c3..4ea1a12 100644
--- a/cmd/bbolt/main_test
+++ b/cmd/bbolt/main_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	bolt "go.etcd.io/bbolt"
+	main "go.etcd.io/bbolt/cmd/bbolt"
 )
 
 // Ensure the "info" command can print information about a database.