diff --git a/scripts/collect-sysfs.sh b/scripts/collect-sysfs.sh
new file mode 100755
index 000000000..ecee563ee
--- /dev/null
+++ b/scripts/collect-sysfs.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+filename=nvme-sysfs-$(hostname)-$(uname -r).tar.xz
+
+declare -a dirs=(
+    "/sys/class/nvme"
+    "/sys/class/nvme-fabrics"
+    "/sys/class/nvme-generic"
+    "/sys/class/nvme-subsystem"
+    "/sys/bus/pci/slots"
+)
+
+files=""
+for d in "${dirs[@]}"; do
+    files+="${d} "
+    for l in "${d}"/*; do
+        files+="$(readlink -f $l) "
+    done
+done
+
+tar -c -J -p -f "${filename}" ${files} 2> /dev/null
diff --git a/test/meson.build b/test/meson.build
index 2b4c6d800..eeb613816 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -97,3 +97,4 @@ endif
 
 subdir('ioctl')
 subdir('nbft')
+subdir('sysfs')
diff --git a/test/sysfs/data/nvme-sysfs-tw-carbon-6.8.0-rc1+.tar.xz b/test/sysfs/data/nvme-sysfs-tw-carbon-6.8.0-rc1+.tar.xz
new file mode 100644
index 000000000..ee11fdeb0
Binary files /dev/null and b/test/sysfs/data/nvme-sysfs-tw-carbon-6.8.0-rc1+.tar.xz differ
diff --git a/test/sysfs/meson.build b/test/sysfs/meson.build
new file mode 100644
index 000000000..36168a4c1
--- /dev/null
+++ b/test/sysfs/meson.build
@@ -0,0 +1,29 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of libnvme.
+# Copyright (c) 2024 SUSE LLC.
+#
+# Authors: Daniel Wagner <dwagner@suse.de>
+
+
+sysfs = executable(
+    'test-sysfs',
+    ['sysfs.c'],
+    dependencies: libnvme_dep,
+    include_directories: [incdir, internal_incdir]
+)
+
+sysfs_files= [
+    'nvme-sysfs-tw-carbon-6.8.0-rc1+.tar.xz'
+]
+
+tar = find_program('tar')
+mkdir = find_program('mkdir')
+setup = find_program('setup.sh')
+
+foreach t_file : sysfs_files
+    r = run_command(setup, files('data'/t_file), meson.current_build_dir(), check: true)
+    d = r.stdout().strip()
+    e0 = 'LIBNVME_SYSFS_PATH=' + d
+    test('sysfs', sysfs, args : [ d ], env: [ e0 ])
+endforeach
diff --git a/test/sysfs/setup.sh b/test/sysfs/setup.sh
new file mode 100644
index 000000000..43574e619
--- /dev/null
+++ b/test/sysfs/setup.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+TARFILE=$1
+BASEDIR=$2
+TESTDIR="$BASEDIR/$(basename -s .tar.xz ${TARFILE})"
+
+mkdir -p "${TESTDIR}"
+tar -x -f "${TARFILE}" -C "${TESTDIR}"
+
+echo "${TESTDIR}"
diff --git a/test/sysfs/sysfs.c b/test/sysfs/sysfs.c
new file mode 100644
index 000000000..847a4eb28
--- /dev/null
+++ b/test/sysfs/sysfs.c
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/**
+ * This file is part of libnvme.
+ * Copyright (c) 2024 Daniel Wagner, SUSE LLC
+ */
+
+#include "nvme/tree.h"
+#include <assert.h>
+#include <string.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <arpa/inet.h>
+
+#include <ccan/array_size/array_size.h>
+
+#include <libnvme.h>
+#include <nvme/private.h>
+
+static bool test_sysfs(const char *path)
+{
+	nvme_root_t r;
+	int err;
+
+	printf("path %s\n", path);
+
+	r = nvme_create_root(stdout, LOG_DEBUG);
+	assert(r);
+
+	err = nvme_scan_topology(r, NULL, NULL);
+	if (!err)
+		nvme_dump_tree(r);
+
+	nvme_free_tree(r);
+
+	return err == 0;
+}
+
+int main(int argc, char *argv[])
+{
+	bool pass = true;
+
+	if (argc < 2) {
+		fprintf(stderr, "usage: test-sysfs DIR\n");
+		return EXIT_FAILURE;
+	}
+
+	pass &= test_sysfs(argv[1]);
+
+	fflush(stdout);
+
+	exit(pass ? EXIT_SUCCESS : EXIT_FAILURE);
+}