diff --git a/src/analyze.cpp b/src/analyze.cpp
index cb757e1db1..ac9563c8a3 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -1108,7 +1108,7 @@ static void resolve_enum_type(CodeGen *g, TypeTableEntry *enum_type) {
     if (enum_type->data.enumeration.embedded_in_current) {
         if (!enum_type->data.enumeration.reported_infinite_err) {
             enum_type->data.enumeration.reported_infinite_err = true;
-            add_node_error(g, decl_node, buf_sprintf("enum contains itself"));
+            add_node_error(g, decl_node, buf_sprintf("enum '%s' contains itself", buf_ptr(&enum_type->name)));
         }
         return;
     }
@@ -1286,7 +1286,8 @@ static void resolve_struct_type(CodeGen *g, TypeTableEntry *struct_type) {
         struct_type->data.structure.is_invalid = true;
         if (!struct_type->data.structure.reported_infinite_err) {
             struct_type->data.structure.reported_infinite_err = true;
-            add_node_error(g, decl_node, buf_sprintf("struct contains itself"));
+            add_node_error(g, decl_node,
+                    buf_sprintf("struct '%s' contains itself", buf_ptr(&struct_type->name)));
         }
         return;
     }
diff --git a/test/run_tests.cpp b/test/run_tests.cpp
index 2fb045943e..2a2d4d640a 100644
--- a/test/run_tests.cpp
+++ b/test/run_tests.cpp
@@ -841,7 +841,7 @@ const x : i32 = 99;
 fn f() {
     x = 1;
 }
-    )SOURCE", 1, ".tmp_source.zig:4:5: error: cannot assign to constant");
+    )SOURCE", 1, ".tmp_source.zig:4:7: error: cannot assign to constant");
 
 
     add_compile_fail_case("missing else clause", R"SOURCE(
@@ -849,18 +849,18 @@ fn f(b: bool) {
     const x : i32 = if (b) { 1 };
     const y = if (b) { i32(1) };
 }
-    )SOURCE", 2, ".tmp_source.zig:3:21: error: expected type 'i32', found 'void'",
+    )SOURCE", 2, ".tmp_source.zig:3:30: error: integer value 1 cannot be implicitly casted to type 'void'",
                  ".tmp_source.zig:4:15: error: incompatible types: 'i32' and 'void'");
 
     add_compile_fail_case("direct struct loop", R"SOURCE(
 const A = struct { a : A, };
-    )SOURCE", 1, ".tmp_source.zig:2:1: error: 'A' depends on itself");
+    )SOURCE", 1, ".tmp_source.zig:2:11: error: struct 'A' contains itself");
 
     add_compile_fail_case("indirect struct loop", R"SOURCE(
 const A = struct { b : B, };
 const B = struct { c : C, };
 const C = struct { a : A, };
-    )SOURCE", 1, ".tmp_source.zig:2:1: error: 'A' depends on itself");
+    )SOURCE", 1, ".tmp_source.zig:2:11: error: struct 'A' contains itself");
 
     add_compile_fail_case("invalid struct field", R"SOURCE(
 const A = struct { x : i32, };