diff --git a/.gitignore b/.gitignore
index e820d19877..865d7846e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ druntime.json
 .DS_Store
 trace.def
 trace.log
-Makefile
+/Makefile
 /errno_c*.obj
 /msvc*.obj
 make
diff --git a/posix.mak b/posix.mak
index 024cc4a9e6..d23156054c 100644
--- a/posix.mak
+++ b/posix.mak
@@ -197,7 +197,7 @@ $(DRUNTIME): $(OBJS) $(SRCS)
 UT_MODULES:=$(patsubst src/%.d,$(ROOT)/unittest/%,$(SRCS))
 HAS_ADDITIONAL_TESTS:=$(shell test -d test && echo 1)
 ifeq ($(HAS_ADDITIONAL_TESTS),1)
-	ADDITIONAL_TESTS:=test/init_fini test/exceptions test/coverage test/profile test/cycles test/allocations
+	ADDITIONAL_TESTS:=test/init_fini test/exceptions test/coverage test/profile test/cycles test/allocations test/typeinfo
 	ADDITIONAL_TESTS+=$(if $(SHARED),test/shared,)
 endif
 
diff --git a/test/typeinfo/Makefile b/test/typeinfo/Makefile
new file mode 100644
index 0000000000..6c371684d7
--- /dev/null
+++ b/test/typeinfo/Makefile
@@ -0,0 +1,17 @@
+include ../common.mak
+
+TESTS:=comparison
+
+.PHONY: all clean
+all: $(addprefix $(ROOT)/,$(addsuffix .done,$(TESTS)))
+
+$(ROOT)/%.done: $(ROOT)/%
+	@echo Testing $*
+	$(QUIET)$(TIMELIMIT)$(ROOT)/$* $(RUN_ARGS)
+	@touch $@
+
+$(ROOT)/%: $(SRC)/%.d
+	$(QUIET)$(DMD) $(DFLAGS) -of$@ $<
+
+clean:
+	rm -rf $(ROOT)
diff --git a/test/typeinfo/src/comparison.d b/test/typeinfo/src/comparison.d
new file mode 100644
index 0000000000..a6719ba546
--- /dev/null
+++ b/test/typeinfo/src/comparison.d
@@ -0,0 +1,78 @@
+// https://github.com/dlang/druntime/pull/1781
+
+struct S
+{
+    int i;
+    static int comparisons;
+    int opCmp(const S s) const { comparisons++; return i - s.i; }
+}
+
+void testStructs()
+{
+    auto s1 = S(1);
+    auto s2 = S(2);
+    auto s3 = S(3);
+    auto s4 = S(4);
+
+    // Test lexicographical order
+
+    assert(s1 < s2 && s2 < s3);
+    assert([s1, s2, s3] < [s1, s3]);
+    assert([s1, s2] < [s1, s2, s3]);
+
+    // Test number of comparisons for nested types
+
+    S.comparisons = 0;
+    assert(s1 < s2);
+    assert(S.comparisons == 1);
+
+    S.comparisons = 0;
+    assert([s1, s2] < [s3, s4]);
+    assert(S.comparisons == 1);
+
+    S.comparisons = 0;
+    assert([[s1, s2]] < [[s3, s4]]);
+    assert(S.comparisons == 1);
+}
+
+class C
+{
+    this(int i) { this.i = i; }
+    int i;
+    static int comparisons;
+    override int opCmp(Object c) const { comparisons++; return i - (cast(C)c).i; }
+}
+
+void testClasses()
+{
+    auto c1 = new C(1);
+    auto c2 = new C(2);
+    auto c3 = new C(3);
+    auto c4 = new C(4);
+
+    // Test lexicographical order
+
+    assert(c1 < c2 && c2 < c3);
+    assert([c1, c2, c3] < [c1, c3]);
+    assert([c1, c2] < [c1, c2, c3]);
+
+    // Test number of comparisons for nested types
+
+    C.comparisons = 0;
+    assert(c1 < c2);
+    assert(C.comparisons == 1);
+
+    C.comparisons = 0;
+    assert([c1, c2] < [c3, c4]);
+    assert(C.comparisons == 1);
+
+    C.comparisons = 0;
+    assert([[c1, c2]] < [[c3, c4]]);
+    assert(C.comparisons == 1);
+}
+
+void main()
+{
+    testStructs();
+    testClasses();
+}