diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b91d153c1a..edcfce20cb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
           go-version: 'stable'
 
       - name: Run Go unit tests
-        run: go test tools/*.go
+        run: go test -C ./tools .
 
       - name: Install dependencies
         run: sudo apt install -y autopoint
diff --git a/.github/workflows/tld-update.yml b/.github/workflows/tld-update.yml
index d5e8621e68..e347769c4f 100644
--- a/.github/workflows/tld-update.yml
+++ b/.github/workflows/tld-update.yml
@@ -4,7 +4,7 @@ on:
   schedule:
     # Run once a day at 15:00 UTC
     - cron:  '0 15 * * *'
-    
+
 permissions:
   contents: read
 
@@ -26,7 +26,7 @@ jobs:
           go-version: 'stable'
 
       - name: Run unit tests
-        run: go test tools/*.go
+        run: go test -v -C ./tools .
 
       - name: Set current date
         id: get-date
@@ -49,7 +49,7 @@ jobs:
             ✅ autopull
             🚩ICANN (IANA/ICP-3) Section
           delete-branch: true
-          
+
       - name: Check outputs
         run: |
           echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
diff --git a/tools/go.mod b/tools/go.mod
new file mode 100644
index 0000000000..92ebf13d8e
--- /dev/null
+++ b/tools/go.mod
@@ -0,0 +1,3 @@
+module github.com/publicsuffix/list/tools
+
+go 1.21
diff --git a/tools/patchnewgtlds b/tools/patchnewgtlds
index ddc93a9007..8a1d39d435 100755
--- a/tools/patchnewgtlds
+++ b/tools/patchnewgtlds
@@ -2,6 +2,7 @@
 
 set -e
 set -o pipefail
+set -x
 
 if ! [ -x "$(command -v go)" ]
 then
@@ -9,8 +10,9 @@ then
   exit 1
 fi
 
-BASEDIR=$(dirname "$0")
+SCRIPT=$(realpath "$0")
+BASEDIR=$(dirname "$SCRIPT")
 
-go run "$BASEDIR/newgtlds.go" \
+go run -C "$BASEDIR/" . \
   -overwrite \
   -psl-dat-file="$BASEDIR/../public_suffix_list.dat"