diff --git a/tests/Makefile.am b/tests/Makefile.am
index b99f9da6..76915e90 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,9 +8,11 @@ if REMOTE_ONLY
 else
 if ARCH_IA64
  noinst_PROGRAMS_arch = ia64-test-sig
- TESTS_arch = ia64-test-stack ia64-test-rbs
+ TESTS_arch =	Gia64-test-stack Lia64-test-stack \
+		Gia64-test-rbs Lia64-test-rbs
 endif
- TESTS_cdep = test-dyn1 test-exc test-resume-sig test-setjmp test-ptrace
+ TESTS_cdep =	Gtest-exc Ltest-exc Gtest-resume-sig Ltest-resume-sig \
+		Gtest-dyn1 Ltest-dyn1 test-setjmp test-ptrace
  noinst_PROGRAMS_cdep = bt test-init test-varargs
 endif
 
@@ -21,8 +23,10 @@ check_PROGRAMS = $(TESTS)
 noinst_PROGRAMS = $(noinst_PROGRAMS_common) $(noinst_PROGRAMS_cdep) \
 	$(noinst_PROGRAMS_arch)
 
-ia64_test_stack_SOURCES = ia64-test-stack.c ia64-test-stack-asm.S
-ia64_test_rbs_SOURCES = ia64-test-rbs.c ia64-test-rbs-asm.S
+Lia64_test_stack_SOURCES = Lia64-test-stack.c ia64-test-stack-asm.S
+Gia64_test_stack_SOURCES = Gia64-test-stack.c ia64-test-stack-asm.S
+Lia64_test_rbs_SOURCES = Lia64-test-rbs.c ia64-test-rbs-asm.S
+Gia64_test_rbs_SOURCES = Gia64-test-rbs.c ia64-test-rbs-asm.S
 
 LDADD = ../src/libunwind-$(arch).la