diff --git a/.topdeps b/.topdeps
index 607c231780..7f16cbcdd5 100644
--- a/.topdeps
+++ b/.topdeps
@@ -1,3 +1 @@
-gcc-branch
-fix-branch
-feature-branch
+zfs-branch
diff --git a/.topmsg b/.topmsg
index 03967cdff5..b607aee225 100644
--- a/.topmsg
+++ b/.topmsg
@@ -1,19 +1,6 @@
 From: Brian Behlendorf <behlendorf1@llnl.gov>
-Subject: [PATCH] zfs branch
+Subject: [PATCH] linux ztest
 
-Merged result of all changes which are relevant to both Solaris
-and Linux builds of the ZFS code.  These are changes where there
-is a reasonable chance they will be accepted upstream.
-
-Additionally, since this is effectively the root of the linux
-ZFS tree the core linux build system is added here.  This
-includes autogen.sh, configure.ac, m4 macros, some scripts/*,
-and makefiles for all the core ZFS components.  Linux-only
-features which require tweaks to the build system should appear
-on the relevant topic branches.  All autotools products which
-result from autogen.sh are commited to the linux-configure-branch.
-
-This branch also contains the META, ChangeLog, AUTHORS, TODO,
-and README, files.
+Minor changes to ztest for this environment.
 
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index a1c291ccd3..2cd410dd79 100644
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@ -2995,31 +2995,21 @@ static void
 ztest_verify_blocks(char *pool)
 {
 	int status;
+	char bin[MAXPATHLEN + MAXNAMELEN + 20];
 	char zdb[MAXPATHLEN + MAXNAMELEN + 20];
 	char zbuf[1024];
-	char *bin;
-	char *ztest;
-	char *isa;
-	int isalen;
 	FILE *fp;
 
-	(void) realpath(getexecname(), zdb);
+	/* Designed to be run exclusively in the development tree */
+	VERIFY(realpath(getexecname(), bin) != NULL);
+	strstr(bin, "/ztest/")[0] = '\0';
 
-	/* zdb lives in /usr/sbin, while ztest lives in /usr/bin */
-	bin = strstr(zdb, "/usr/bin/");
-	ztest = strstr(bin, "/ztest");
-	isa = bin + 8;
-	isalen = ztest - isa;
-	isa = strdup(isa);
-	/* LINTED */
-	(void) sprintf(bin,
-	    "/usr/sbin%.*s/zdb -bc%s%s -U /tmp/zpool.cache %s",
-	    isalen,
-	    isa,
+	(void) sprintf(zdb,
+	    "%s/zdb/zdb -bc%s%s -U /tmp/zpool.cache %s",
+	    bin,
 	    zopt_verbose >= 3 ? "s" : "",
 	    zopt_verbose >= 4 ? "v" : "",
 	    pool);
-	free(isa);
 
 	if (zopt_verbose >= 5)
 		(void) printf("Executing %s\n", strstr(zdb, "zdb "));