diff --git a/test/hs/Makefile.am b/test/hs/Makefile.am
index e948b41..2e016c4 100644
--- a/test/hs/Makefile.am
+++ b/test/hs/Makefile.am
@@ -19,17 +19,19 @@
 
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
-stubs: ../ConstantsDemo.thrift ../DebugProtoTest.thrift ../ThriftTest.thrift ../Include.thrift
+stubs: ../ConstantsDemo.thrift ../DebugProtoTest.thrift ../ThriftTest.thrift ../Include.thrift ../NameConflictTest.thrift
 	$(THRIFT) --gen hs ../ConstantsDemo.thrift
 	$(THRIFT) --gen hs ../DebugProtoTest.thrift
 	$(THRIFT) --gen hs ../ThriftTest.thrift
 	$(THRIFT) --gen hs ../Include.thrift
+	$(THRIFT) --gen hs ../NameConflictTest.thrift
 
 check: stubs
 	sh run-test.sh ConstantsDemo
 	sh run-test.sh DebugProtoTest
 	sh run-test.sh ThriftTest
 	sh run-test.sh Include
+	sh run-test.sh NameConflictTest
 
 clean-local:
 	$(RM) -r gen-hs
diff --git a/test/hs/NameConflictTest_Main.hs b/test/hs/NameConflictTest_Main.hs
new file mode 100644
index 0000000..5d0b17a
--- /dev/null
+++ b/test/hs/NameConflictTest_Main.hs
@@ -0,0 +1,19 @@
+module Main where
+
+import qualified Prelude as P
+
+import NameConflictTest_Consts
+import NameConflictTest_Types
+import Qualified
+import Qualified_Client
+import Qualified_Iface
+import Extern
+import Extern_Client
+import Extern_Iface
+
+main :: P.IO ()
+main = do
+  P.putStrLn "Values:"
+  P.print ([JUST, TRUE, FALSE] :: [Maybe])
+  P.print ([LEFT, RIGHT] :: [Either])
+  P.print (Problem_ (P.Just P.True) (P.Just P.False))