diff --git a/Makefile b/Makefile
index 358a03af5..2c2a1bc11 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ core-dev: generate
 # Shorthand for quickly testing the core of Terraform (i.e. "not providers")
 core-test: generate
 	@echo "Testing core packages..." && \
-		go test -tags 'core' $(TESTARGS) $(shell go list ./... | grep -v -E 'builtin|terraform/vendor')
+		go test -tags 'core' $(TESTARGS) $(shell go list ./... | grep -v -E 'terraform/(builtin|vendor)')
 
 # Shorthand for building and installing just one plugin for local testing.
 # Run as (for example): make plugin-dev PLUGIN=provider-aws