From 3ac40a2f5076764d3530d552ccb51c48c89dffe7 Mon Sep 17 00:00:00 2001
From: Michael Li <michael.li@hashicorp.com>
Date: Thu, 2 Apr 2026 19:16:33 +0000
Subject: [PATCH] backport of commit 1ca57fc64ec877262b80564eb02a4f10444c0206

---
 .github/workflows/test-race.yml | 1 -
 .github/workflows/test.yml      | 1 -
 Makefile                        | 4 ++--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-race.yml b/.github/workflows/test-race.yml
index 087120c69c..15fafe9366 100644
--- a/.github/workflows/test-race.yml
+++ b/.github/workflows/test-race.yml
@@ -191,7 +191,6 @@ jobs:
       - name: Test
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         env:
-          TEST_PACKAGE: "./..."
           TEST_TIMEOUT: 120m
           TESTARGS: -race -v
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1d6146b10a..34b8737380 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -189,7 +189,6 @@ jobs:
       - name: Test
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         env:
-          TEST_PACKAGE: "./..."
           TESTARGS: -v
           TEST_TIMEOUT: 40m
         with:
diff --git a/Makefile b/Makefile
index 046425388a..a4bdda69b9 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ THIS_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 TMP_DIR := $(shell mktemp -d)
 REPO_PATH := github.com/hashicorp/boundary
 
-TEST_PACKAGE ?= ./...
+TEST_PACKAGE ?= $(shell go list ./... | grep -v '/e2e')
 TEST_TIMEOUT ?= 30m
 
 CGO_ENABLED?=0
@@ -326,7 +326,7 @@ test-sql:
 
 .PHONY: test
 test:
-	go test "$(TEST_PACKAGE)" -tags="$(BUILD_TAGS)" $(TESTARGS) -json -cover -timeout $(TEST_TIMEOUT) | tparse -follow
+	go test $(TEST_PACKAGE) -tags="$(BUILD_TAGS)" $(TESTARGS) -json -cover -timeout $(TEST_TIMEOUT) | tparse -follow
 
 .PHONY: test-sdk
 test-sdk: