diff --git a/test/behavior/error.zig b/test/behavior/error.zig
index ae1445dd9e54..f5bf6493d88c 100644
--- a/test/behavior/error.zig
+++ b/test/behavior/error.zig
@@ -287,6 +287,27 @@ test "inferred empty error set comptime catch" {
     S.foo() catch @compileError("fail");
 }
 
+test "error inference with an empty set" {
+    const S = struct {
+        const Struct = struct {
+            pub fn func() (error{})!usize {
+                return 0;
+            }
+        };
+
+        fn AnotherStruct(comptime SubStruct: type) type {
+            return struct {
+                fn anotherFunc() !void {
+                    try expect(0 == (try SubStruct.func()));
+                }
+            };
+        }
+    };
+
+    const GeneratedStruct = S.AnotherStruct(S.Struct);
+    try GeneratedStruct.anotherFunc();
+}
+
 test "error union peer type resolution" {
     if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
diff --git a/test/behavior/ptrcast.zig b/test/behavior/ptrcast.zig
index 982a0b862f8a..f25161ece86b 100644
--- a/test/behavior/ptrcast.zig
+++ b/test/behavior/ptrcast.zig
@@ -203,6 +203,37 @@ test "comptime ptrcast keeps larger alignment" {
     }
 }
 
+test "ptrcast of const integer has the correct object size" {
+    const is_value = ~@intCast(isize, std.math.minInt(isize));
+    const is_bytes = @ptrCast([*]const u8, &is_value)[0..@sizeOf(isize)];
+    if (@sizeOf(isize) == 8) {
+        switch (native_endian) {
+            .Little => {
+                try expect(is_bytes[0] == 0xff);
+                try expect(is_bytes[1] == 0xff);
+                try expect(is_bytes[2] == 0xff);
+                try expect(is_bytes[3] == 0xff);
+
+                try expect(is_bytes[4] == 0xff);
+                try expect(is_bytes[5] == 0xff);
+                try expect(is_bytes[6] == 0xff);
+                try expect(is_bytes[7] == 0x7f);
+            },
+            .Big => {
+                try expect(is_bytes[0] == 0x7f);
+                try expect(is_bytes[1] == 0xff);
+                try expect(is_bytes[2] == 0xff);
+                try expect(is_bytes[3] == 0xff);
+
+                try expect(is_bytes[4] == 0xff);
+                try expect(is_bytes[5] == 0xff);
+                try expect(is_bytes[6] == 0xff);
+                try expect(is_bytes[7] == 0xff);
+            },
+        }
+    }
+}
+
 test "implicit optional pointer to optional anyopaque pointer" {
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO