diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml
index 376dc9560..8f68b024c 100644
--- a/.github/workflows/build-on-pull-request.yml
+++ b/.github/workflows/build-on-pull-request.yml
@@ -29,7 +29,7 @@ jobs:
         run: make -j2 bin USER_CFLAGS=-Werror
       - name: Build the dbginfo example
         shell: bash
-        run: make -j2 -C src dbginfo
+        run: make -j2 -C src test
       - name: Build the utilities.
         shell: bash
         run: make -j2 util
diff --git a/Makefile b/Makefile
index 0eb18f94b..9e30d2bb4 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ test:
 # GNU "check" target, which runs all tests
 check:
 	@$(MAKE) -C .github/checks checkstyle --no-print-directory
-	@$(MAKE) -C src dbginfo               --no-print-directory
+	@$(MAKE) -C src test                  --no-print-directory
 	@$(MAKE) test
 	@$(MAKE) -C targettest platforms      --no-print-directory
 	@$(MAKE) -C samples platforms         --no-print-directory
diff --git a/src/Makefile b/src/Makefile
index 27724028c..c5d91ce5a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -21,7 +21,7 @@ PROGS = ar65     \
         sim65    \
         sp65
 
-.PHONY: all mostlyclean clean install zip avail unavail bin $(PROGS) dbginfo
+.PHONY: all mostlyclean clean install zip avail unavail bin $(PROGS)
 
 .SUFFIXES:
 
@@ -168,7 +168,19 @@ $(eval $(call OBJS_template,common))
 
 $(foreach prog,$(PROGS),$(eval $(call PROG_template,$(prog))))
 
-dbginfo:
-$(eval $(call PROG_template,dbginfo))
+
+.PHONY: dbginfo dbgsh test
+
+test: dbginfo dbgsh
+
+$(eval $(call OBJS_template,dbginfo))
+
+dbginfo: $(dbginfo_OBJS)
+
+../wrk/dbgsh$(EXE_SUFFIX): $(dbginfo_OBJS) ../wrk/common/common.a
+	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+dbgsh: ../wrk/dbgsh$(EXE_SUFFIX)
+
 
 -include $(DEPS)