diff --git a/js_test.go b/js_test.go
index 33e721b66..5fac93f9c 100644
--- a/js_test.go
+++ b/js_test.go
@@ -81,6 +81,7 @@ func createConfFile(t *testing.T, content []byte) string {
 }
 
 func shutdownJSServerAndRemoveStorage(t *testing.T, s *server.Server) {
+	t.Helper()
 	var sd string
 	if config := s.JetStreamConfig(); config != nil {
 		sd = config.StoreDir
diff --git a/nats_test.go b/nats_test.go
index f005fc5ff..d689d4456 100644
--- a/nats_test.go
+++ b/nats_test.go
@@ -137,10 +137,6 @@ func TestExpandPath(t *testing.T) {
 			{path: "/Foo/Bar", userProfile: `C:\Foo\Bar`, wantPath: "/Foo/Bar"},
 			{path: "Foo/Bar", userProfile: `C:\Foo\Bar`, wantPath: "Foo/Bar"},
 			{path: "~/Fizz", userProfile: `C:\Foo\Bar`, wantPath: `C:\Foo\Bar\Fizz`},
-			// That one would fail because expandPath(), if not finding `~` returns
-			// the given path, which since ${HOMEDRIVE}${HOMEPATH} is not set,
-			// would return `\Fizz` but test expects `C:\Foo\Bar\Fizz`?
-			// {path: `${HOMEDRIVE}${HOMEPATH}\Fizz`, userProfile: `C:\Foo\Bar`, wantPath: `C:\Foo\Bar\Fizz`},
 
 			// Missing USERPROFILE.
 			{path: "~/Fizz", homeDrive: "X:", homePath: `\Foo\Bar`, wantPath: `X:\Foo\Bar\Fizz`},
diff --git a/test/js_test.go b/test/js_test.go
index 0880cf86d..2d83f7c7b 100644
--- a/test/js_test.go
+++ b/test/js_test.go
@@ -36,6 +36,7 @@ import (
 )
 
 func shutdownJSServerAndRemoveStorage(t *testing.T, s *server.Server) {
+	t.Helper()
 	var sd string
 	if config := s.JetStreamConfig(); config != nil {
 		sd = config.StoreDir