diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 48e8dd4a9..21d6e9247 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -31,12 +31,6 @@ jobs:
         uses: actions/setup-go@v1
         with:
           go-version: ${{ matrix.go-version }}
-      - name: Install OPA
-        run: |
-          OS=$(uname | tr '[:upper:]' '[:lower:]')
-          cd /usr/local/bin
-          sudo curl -L -o opa https://openpolicyagent.org/downloads/latest/opa_${OS}_amd64
-          sudo chmod +x ./opa
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Test
diff --git a/Makefile b/Makefile
index 424280b7c..fc68e2502 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ build-deps: ## Install build dependencies
 	@echo "==> $@"
 	@cd /tmp; GO111MODULE=on go get -u github.com/client9/misspell/cmd/misspell
 	@cd /tmp; GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_VERSION}
+	@cd /tmp; GO111MODULE=on go get -u github.com/open-policy-agent/opa
 
 .PHONY: docs
 docs: ## Start the vuepress docs development server