diff --git a/ansi-tests/tagbody.lsp b/ansi-tests/tagbody.lsp
index fd373e176558dac9525dba2e97b06d277caa8ed5..5f43df3e1a19aaa427045c5c6843c477510f0145 100644
--- a/ansi-tests/tagbody.lsp
+++ b/ansi-tests/tagbody.lsp
@@ -159,3 +159,19 @@
     (eval form))
   good)
 
+;;; Check that macros are not expanded before finding tags
+;;; Test for issue TAGBODY-TAG-EXPANSION
+(deftest tagbody.17
+  (block done
+    (tagbody
+     (macrolet ((foo () 'tag))
+       (let (tag)
+	 (tagbody
+	  (go tag)
+	  (foo)
+	  (return-from done :bad))))
+     tag
+     (return-from done :good)))
+  :good)
+
+