diff --git a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Padding/More64BitWaste/More64BitWaste.expected b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Padding/More64BitWaste/More64BitWaste.expected
new file mode 100644
index 00000000000..1eb90a57e9a
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Padding/More64BitWaste/More64BitWaste.expected	
@@ -0,0 +1,2 @@
+| test.cpp:17:8:17:12 | test4 | test4 includes 0 bits of padding on ILP32, but 32 bits on LP64. |
+| test.cpp:29:8:29:12 | test6 | test6 includes 0 bits of padding on ILP32, but 32 bits on LP64. |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Padding/More64BitWaste/More64BitWaste.qlref b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Padding/More64BitWaste/More64BitWaste.qlref
new file mode 100644
index 00000000000..614ac0198be
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Padding/More64BitWaste/More64BitWaste.qlref	
@@ -0,0 +1 @@
+Likely Bugs/Memory Management/Padding/More64BitWaste.ql
\ No newline at end of file
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Padding/More64BitWaste/test.cpp b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Padding/More64BitWaste/test.cpp
new file mode 100644
index 00000000000..0703d4dfe78
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Padding/More64BitWaste/test.cpp	
@@ -0,0 +1,39 @@
+
+struct test1
+{
+	int x;
+};
+
+struct test2
+{
+	int x, y;
+};
+
+struct test3
+{
+	int x, y, z;
+};
+
+struct test4 // BAD
+{
+	int a;
+	long long b;
+};
+
+struct test5
+{
+	long long a;
+	int b;
+};
+
+struct test6 // BAD
+{
+	char as[4];
+	long long b;
+};
+
+struct test7
+{
+	char as[8];
+	long long b;
+};