diff --git a/test/meson.build b/test/meson.build
index 2ab7e312..d3d64562 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -23,6 +23,17 @@ if cxx_available
         dependencies: libnvme_dep,
         include_directories: [incdir, internal_incdir]
     )
+
+    test('cpp-dump', cpp)
+
+    misc = executable(
+        'test-misc',
+        ['misc.cc'],
+        dependencies: libnvme_dep,
+        include_directories: [incdir, internal_incdir]
+    )
+    test('cpp-misc', misc)
+
 endif
 
 register = executable(
diff --git a/test/misc.cc b/test/misc.cc
new file mode 100644
index 00000000..3613beb0
--- /dev/null
+++ b/test/misc.cc
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/**
+ * This file is part of libnvme.
+ * Copyright (c) 2025 Daniel Wagner, SUSE LLC
+ */
+
+#include <algorithm>
+#include <libnvme.h>
+
+static int minmax_test()
+{
+	/*
+	 * Ensure libnvme doesn't spoil the namespace, e.g. by exposing a
+	 * min/max macro.
+	 */
+	return !(std::min(1, 2) == 1 && std::max(1, 2) == 2);
+}
+
+int main(int argc, char *argv[])
+{
+	return minmax_test();
+}