diff --git a/doc/man7/flux-broker-attributes.rst b/doc/man7/flux-broker-attributes.rst
index ec9845760aa7..851072ebda58 100644
--- a/doc/man7/flux-broker-attributes.rst
+++ b/doc/man7/flux-broker-attributes.rst
@@ -33,15 +33,23 @@ version
    The version of flux-core that was used to build this broker.
 
 rundir [Updates: C]
-   A temporary directory where UNIX domain sockets and the default
-   content.backing-path are located (see below).  By default, each broker
-   rank creates a unique rundir in $TMPDIR and removes it on exit.  If
-   rundir is set on the command line, beware exceeding the UNIX domain socket
-   path limit described in :linux:man7:`unix`, as low as 92 bytes on
-   some systems.  If rundir is set to a pre-existing directory, the
-   directory is not removed on exit; if the broker has to create the
-   directory, it is removed.  In most cases this attribute should not
-   be set by users.
+   A temporary directory where the broker's UNIX domain sockets are located.
+   In addition, if ``statedir`` is not set, this directory is used by the
+   content backing store (if applicable).  By default, each broker rank creates
+   a unique ``rundir`` in ``$TMPDIR`` and removes it on exit.  If ``rundir`` is
+   set on the command line, beware exceeding the UNIX domain socket path limit
+   described in :linux:man7:`unix`, as low as 92 bytes on some systems.  To
+   support the :man1:`flux-start` ``--test-size`` option where multiple brokers
+   share a ``rundir``, if ``rundir`` is set to a pre-existing directory, the
+   directory is not removed by the broker on exit.  In most cases this
+   attribute should not be set by users.
+
+statedir [Updates: C]
+   A directory in which persistent state is stored by the Flux broker.  For
+   example, content backing store data is stored here to facilitate restarts.
+   If unset, this data goes to ``rundir`` where it is cleaned up on instance
+   shutdown.  If set, this directory must exist and be owned by the instance
+   owner.  Default: unset.
 
 security.owner
    The numeric userid of the owner of this Flux instance.
@@ -239,14 +247,6 @@ content.backing-module (Updates: C)
    on rank 0 where the content backing store is active.  Default:
    ``content-sqlite``.
 
-content.backing-path (Updates: C)
-   The path to the content backing store file(s). If this is set on the
-   broker command line, the backing store uses this path instead of
-   a temporary one, and content is preserved on instance exit.
-   If file exists, its content is imported into the instance.
-   If it doesn't exist, it is created.  Default: ``content.sqlite``
-   located within ``rundir``.
-
 content.blob-size-limit (Updates: C, R)
    The maximum size of a blob, the basic unit of content storage.
    Default: ``1073741824``.
diff --git a/doc/test/spell.en.pws b/doc/test/spell.en.pws
index f7e2ed109bad..804b12e22d0b 100644
--- a/doc/test/spell.en.pws
+++ b/doc/test/spell.en.pws
@@ -621,3 +621,4 @@ POSIX
 ustar
 xz
 validator
+statedir
diff --git a/etc/flux.service.in b/etc/flux.service.in
index 169f732d6b2a..cddb415bedea 100644
--- a/etc/flux.service.in
+++ b/etc/flux.service.in
@@ -13,10 +13,10 @@ ExecStart=/bin/bash -c '\
   -Scron.directory=@X_SYSCONFDIR@/flux/system/cron.d \
   -Stbon.fanout=256 \
   -Srundir=@X_RUNSTATEDIR@/flux \
+  -Sstatedir=${STATE_DIRECTORY:-/var/lib/flux} \
   -Slocal-uri=local://@X_RUNSTATEDIR@/flux/local \
   -Slog-stderr-level=6 \
   -Slog-stderr-mode=local \
-  -Scontent.backing-path=${STATE_DIRECTORY:-/var/lib/flux}/content.sqlite \
   -Sbroker.rc2_none \
   -Sbroker.quorum=0 \
   -Sbroker.quorum-timeout=none \
diff --git a/src/broker/broker.c b/src/broker/broker.c
index 3b84ccad2229..df4c43761ff9 100644
--- a/src/broker/broker.c
+++ b/src/broker/broker.c
@@ -91,6 +91,7 @@ static int unload_module_byname (broker_ctx_t *ctx, const char *name,
 static void set_proctitle (uint32_t rank);
 
 static int create_rundir (attr_t *attrs);
+static int check_statedir (attr_t *attrs);
 
 static int create_runat_phases (broker_ctx_t *ctx);
 
@@ -308,6 +309,8 @@ int main (int argc, char *argv[])
 
     if (create_rundir (ctx.attrs) < 0)
         goto cleanup;
+    if (check_statedir (ctx.attrs) < 0)
+        goto cleanup;
 
     /* Record the broker start time.  This time will also be used to
      * capture how long network bootstrap takes.
@@ -735,6 +738,11 @@ static int checkdir (const char *name, const char *path)
         log_err ("cannot stat %s %s", name, path);
         return -1;
     }
+    if (sb.st_uid != getuid ()) {
+        errno = EPERM;
+        log_err ("%s %s is not owned by instance owner", name, path);
+        return -1;
+    }
     if (!S_ISDIR (sb.st_mode)) {
         errno = ENOTDIR;
         log_err ("%s %s", name, path);
@@ -748,6 +756,29 @@ static int checkdir (const char *name, const char *path)
     return 0;
 }
 
+/* Validate statedir, if set.
+ * Ensure that the attribute cannot change from this point forward.
+ */
+static int check_statedir (attr_t *attrs)
+{
+    const char *statedir;
+
+    if (attr_get (attrs, "statedir", &statedir, NULL) < 0) {
+        if (attr_add (attrs, "statedir", NULL, FLUX_ATTRFLAG_IMMUTABLE) < 0) {
+            log_err ("error creating statedir broker attribute");
+            return -1;
+        }
+    }
+    else {
+        if (checkdir ("statedir", statedir) < 0)
+            return -1;
+        if (attr_set_flags (attrs, "statedir", FLUX_ATTRFLAG_IMMUTABLE) < 0) {
+            log_err ("error setting statedir broker attribute flags");
+            return -1;
+        }
+    }
+    return 0;
+}
 
 /*  Handle global rundir attribute.
  */
diff --git a/src/modules/content-files/content-files.c b/src/modules/content-files/content-files.c
index f744fd2a8645..83fbe1b211cd 100644
--- a/src/modules/content-files/content-files.c
+++ b/src/modules/content-files/content-files.c
@@ -256,7 +256,7 @@ static const struct flux_msg_handler_spec htab[] = {
 static struct content_files *content_files_create (flux_t *h)
 {
     struct content_files *ctx;
-    const char *backing_path;
+    const char *dbdir;
 
     if (!(ctx = calloc (1, sizeof (*ctx))))
         return NULL;
@@ -271,33 +271,19 @@ static struct content_files *content_files_create (flux_t *h)
         goto error;
     }
 
-    /* If 'content.backing-path' attribute is already set, then:
-     * - value is the db directory
-     * - if it exists, preserve existing content; else create empty
-     * Otherwise:
-     * - ${rundir}/content.files is the backing path
-     * - set 'content.backing-path' to this name
-     * - ${rundir} is cleaned up recursively by broker atexit(3) handler
+    /* Prefer 'statedir' as the location for the content.files directory,
+     * if set.  Otherwise use 'rundir'.  If the directory exists, the
+     * instance is restarting.
      */
-    backing_path = flux_attr_get (h, "content.backing-path");
-    if (backing_path) {
-        if (!(ctx->dbpath = strdup (backing_path)))
-            goto error;
-        if (mkdir (ctx->dbpath, 0700) < 0 && errno != EEXIST)
-            goto error;
-    }
-    else {
-        const char *rundir = flux_attr_get (h, "rundir");
-        if (!rundir) {
-            flux_log_error (h, "rundir");
-            goto error;
-        }
-        if (asprintf (&ctx->dbpath, "%s/content.files", rundir) < 0)
-            goto error;
-        if (flux_attr_set (h, "content.backing-path", ctx->dbpath) < 0)
-            goto error;
-        if (mkdir (ctx->dbpath, 0700) < 0)
-            goto error;
+    if (!(dbdir = flux_attr_get (h, "statedir")))
+        dbdir = flux_attr_get (h, "rundir");
+    if (!dbdir)
+        flux_log_error (h, "neither statedir nor rundir are set");
+    if (asprintf (&ctx->dbpath, "%s/content.files", dbdir) < 0)
+        goto error;
+    if (mkdir (ctx->dbpath, 0700) < 0 && errno != EEXIST) {
+        flux_log_error (h, "could not create %s", ctx->dbpath);
+        goto error;
     }
     if (flux_msg_handler_addvec (h, htab, ctx, &ctx->handlers) < 0)
         goto error;
diff --git a/src/modules/content-sqlite/content-sqlite.c b/src/modules/content-sqlite/content-sqlite.c
index 82924d0c2289..75397f5d08fc 100644
--- a/src/modules/content-sqlite/content-sqlite.c
+++ b/src/modules/content-sqlite/content-sqlite.c
@@ -592,7 +592,7 @@ static const struct flux_msg_handler_spec htab[] = {
 static struct content_sqlite *content_sqlite_create (flux_t *h)
 {
     struct content_sqlite *ctx;
-    const char *backing_path;
+    const char *dbdir;
 
     if (!(ctx = calloc (1, sizeof (*ctx))))
         return NULL;
@@ -611,36 +611,26 @@ static struct content_sqlite *content_sqlite_create (flux_t *h)
         goto error;
     }
 
-    /* If 'content.backing-path' attribute is already set, then:
-     * - value is the sqlite backing file
-     * - if it exists, preserve existing content; else create empty
-     * Otherwise:
-     * - ${rundir}/content.sqlite is the backing file
-     * - ${rundir} is normally recursively cleaned up when the instance exits
-     * - set 'content.backing-path' to this name
+    /* Prefer 'statedir' as the location for content.sqlite file, if set.
+     * Otherwise use 'rundir'.
      */
-    backing_path = flux_attr_get (h, "content.backing-path");
-    if (backing_path) {
-        if (!(ctx->dbfile = strdup (backing_path)))
-            goto error;
-        if (access (ctx->dbfile, F_OK) == 0) {
-            if (access (ctx->dbfile, R_OK | W_OK) < 0) {
-                flux_log_error (h, "%s", ctx->dbfile);
-                goto error;
-            }
-        }
-    }
-    else {
-        const char *rundir = flux_attr_get (h, "rundir");
-        if (!rundir) {
-            flux_log_error (h, "rundir");
+    if (!(dbdir = flux_attr_get (h, "statedir")))
+        dbdir = flux_attr_get (h, "rundir");
+    if (!dbdir)
+        flux_log_error (h, "neither statedir nor rundir are set");
+    if (asprintf (&ctx->dbfile, "%s/content.sqlite", dbdir) < 0)
+        goto error;
+
+    /* If dbfile exists, we are restarting.
+     * If existing dbfile does not have the right permissions, fail early.
+     */
+    if (access (ctx->dbfile, F_OK) == 0) {
+        if (access (ctx->dbfile, R_OK | W_OK) < 0) {
+            flux_log_error (h, "%s", ctx->dbfile);
             goto error;
         }
-        if (asprintf (&ctx->dbfile, "%s/content.sqlite", rundir) < 0)
-            goto error;
-        if (flux_attr_set (h, "content.backing-path", ctx->dbfile) < 0)
-            goto error;
     }
+
     if (flux_msg_handler_addvec (h, htab, ctx, &ctx->handlers) < 0)
         goto error;
     return ctx;
@@ -657,7 +647,7 @@ int mod_main (flux_t *h, int argc, char **argv)
         flux_log_error (h, "content_sqlite_create failed");
         return -1;
     }
-    if (content_sqlite_opendb(ctx) < 0)
+    if (content_sqlite_opendb (ctx) < 0)
         goto done;
     if (content_register_backing_store (h, "content-sqlite") < 0)
         goto done;
diff --git a/t/issues/t4222-kvs-assume-empty-dir.sh b/t/issues/t4222-kvs-assume-empty-dir.sh
index 5fe8070de6b6..3e7feebd8d4c 100755
--- a/t/issues/t4222-kvs-assume-empty-dir.sh
+++ b/t/issues/t4222-kvs-assume-empty-dir.sh
@@ -8,7 +8,7 @@ flux content flush
 flux content dropcache
 flux module remove content-sqlite
 
-sqlitepath=`flux getattr content.backing-path`
+sqlitepath=$(flux getattr rundir)/content.sqlite
 mv $sqlitepath $sqlitepath.bak
 
 flux module load content-sqlite
diff --git a/t/t0001-basic.t b/t/t0001-basic.t
index 744f46aefdde..499d286536b0 100755
--- a/t/t0001-basic.t
+++ b/t/t0001-basic.t
@@ -402,19 +402,44 @@ test_expect_success 'broker fails gracefully on unwriteable rundir' '
 		/bin/true 2>privdir.err &&
 	grep "permissions" privdir.err
 '
+# statedir created here is reused in the next several tests
+test_expect_success 'broker statedir is not cleaned up' '
+	mkdir -p statedir &&
+	flux start ${ARGS} -o,-Sstatedir=$(pwd)/statedir /bin/true &&
+	test -d statedir
+'
+test_expect_success 'broker statedir cannot be changed at runtime' '
+	test_must_fail flux start ${ARGS} -o,-Sstatedir=$(pwd)/statedir \
+		flux setattr statedir $(pwd)/statedir 2>rostatedir.err &&
+	grep "Operation not permitted" rostatedir.err
+'
+test_expect_success 'broker statedir cannot be set at runtime' '
+	test_must_fail flux start ${ARGS} \
+		flux setattr statedir $(pwd)/statedir 2>rostatedir2.err &&
+	grep "Operation not permitted" rostatedir2.err
+'
+test_expect_success 'broker fails when statedir does not exist' '
+	rm -rf statedir &&
+	test_must_fail flux start ${ARGS} -o,-Sstatedir=$(pwd)/statedir \
+		/bin/true 2>nostatedir.err &&
+	grep "cannot stat" nostatedir.err
+'
 # Use -eq hack to test that BROKERPID is a number
 test_expect_success 'broker broker.pid attribute is readable' '
 	BROKERPID=`flux start ${ARGS} flux getattr broker.pid` &&
 	test -n "$BROKERPID" &&
 	test "$BROKERPID" -eq "$BROKERPID"
 '
+
 test_expect_success 'local-uri override works' '
-	newsock=local:///tmp/meep &&
+	sockdir=$(mktemp -d) &&
+	newsock=local://$sockdir/meep &&
 	echo $newsock >uri.exp &&
 	flux start ${ARGS} \
 		-o,-Slocal-uri=$newsock \
 		printenv FLUX_URI >uri.out &&
-	test_cmp uri.exp uri.out
+	test_cmp uri.exp uri.out &&
+	rm -rf $sockdir
 '
 test_expect_success 'broker fails gracefully when local-uri is malformed' '
 	test_must_fail flux start ${ARGS} -o,-Slocal-uri=baduri \
diff --git a/t/t0012-content-sqlite.t b/t/t0012-content-sqlite.t
index 7beb26e23f2f..8c4d66e33cc8 100755
--- a/t/t0012-content-sqlite.t
+++ b/t/t0012-content-sqlite.t
@@ -201,7 +201,7 @@ test_expect_success 'remove heartbeat module' '
 
 # test for issue #4210
 test_expect_success 'remove read permission from content.sqlite file' '
-	chmod u-w $(flux getattr content.backing-path) &&
+	chmod u-w $(flux getattr rundir)/content.sqlite &&
 	test_must_fail flux module load content-sqlite
 '
 
diff --git a/t/t0018-content-files.t b/t/t0018-content-files.t
index bf8a24bb7384..990820b63889 100755
--- a/t/t0018-content-files.t
+++ b/t/t0018-content-files.t
@@ -8,7 +8,7 @@ if test "$TEST_LONG" = "t"; then
     test_set_prereq LONGTEST
 fi
 
-test_under_flux 1 minimal
+test_under_flux 1 minimal -o,-Sstatedir=$(pwd)
 
 BLOBREF=${FLUX_BUILD_DIR}/t/kvs/blobref
 RPC=${FLUX_BUILD_DIR}/t/request/rpc
@@ -76,15 +76,10 @@ test_expect_success 'load content-files module' '
 	flux module load content-files testing
 '
 
-test_expect_success 'content.backing-path attribute is set' '
-	FILEDB=$(flux getattr content.backing-path) &&
-	test -d ${FILEDB}
-'
-
 test_expect_success 'load/store/verify key-values stored directly' '
 	make_blob 140 >rawblob.140 &&
-	$TEST_STORE $FILEDB testkey1 <rawblob.140 &&
-	$TEST_LOAD $FILEDB testkey1 >rawblob.140.out &&
+	$TEST_STORE $(pwd)/content.files testkey1 <rawblob.140 &&
+	$TEST_LOAD $(pwd)/content.files testkey1 >rawblob.140.out &&
 	test_cmp rawblob.140 rawblob.140.out
 '
 
diff --git a/t/t0024-content-s3.t b/t/t0024-content-s3.t
index 6b806071257b..cd5c97b10c8c 100755
--- a/t/t0024-content-s3.t
+++ b/t/t0024-content-s3.t
@@ -280,13 +280,13 @@ EOF
         chmod +x rc3-content-s3
 '
 
-test_expect_success 'run instance with content.backing-path set (s3)' '
+test_expect_success 'run instance with content-s3 module loaded' '
 	flux start -o,--setattr=broker.rc1_path=$(pwd)/rc1-content-s3 \
                    -o,--setattr=broker.rc3_path=$(pwd)/rc3-content-s3 \
 	           flux kvs put testkey=43
 '
 
-test_expect_success 're-run instance with content.backing-path set (s3)' '
+test_expect_success 're-run instance with content-s3 module loaded' '
 	flux start -o,--setattr=broker.rc1_path=$(pwd)/rc1-content-s3 \
                    -o,--setattr=broker.rc3_path=$(pwd)/rc3-content-s3 \
 	           flux kvs get testkey >gets3.out
diff --git a/t/t2008-althash.t b/t/t2008-althash.t
index c9da37228f39..c5f8ff74dc08 100755
--- a/t/t2008-althash.t
+++ b/t/t2008-althash.t
@@ -30,7 +30,7 @@ test_expect_success 'Started instance with content.hash=sha256' '
 test_expect_success 'Started instance with content.hash=sha256,content-files' '
     OUT=$(flux start -o,-Scontent.hash=sha256 \
           -o,-Scontent.backing-module=content-files \
-          -o,-Scontent.backing-path=$(pwd)/content.files \
+          -o,-Sstatedir=$(pwd) \
           flux getattr content.hash) && test "$OUT" = "sha256" &&
     ls -1 content.files | tail -1 | grep sha256
 '
diff --git a/t/t2010-kvs-snapshot-restore.t b/t/t2010-kvs-snapshot-restore.t
index b635274086c8..677e99c69e94 100755
--- a/t/t2010-kvs-snapshot-restore.t
+++ b/t/t2010-kvs-snapshot-restore.t
@@ -15,8 +15,8 @@ CHANGECHECKPOINT=${FLUX_SOURCE_DIR}/t/kvs/change-checkpoint.py
 # test content-sqlite backing
 #
 
-test_expect_success 'run instance with content.backing-path set (sqlite)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+test_expect_success 'run instance with statedir set (sqlite)' '
+	flux start -o,--setattr=statedir=$(pwd) \
 	           flux kvs put testkey=42
 '
 
@@ -25,8 +25,8 @@ test_expect_success 'content.sqlite file exists after instance exited' '
 	echo Size in bytes: $(stat --format "%s" content.sqlite)
 '
 
-test_expect_success 're-run instance with content.backing-path set (sqlite)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+test_expect_success 're-run instance with statedir set (sqlite)' '
+	flux start -o,--setattr=statedir=$(pwd) \
 	           flux kvs get testkey >getsqlite.out
 '
 
@@ -36,7 +36,7 @@ test_expect_success 'content from previous instance survived (sqlite)' '
 '
 
 test_expect_success 're-run instance, verify checkpoint date saved (sqlite)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	           flux dmesg >dmesgsqlite1.out
 '
 
@@ -47,7 +47,7 @@ test_expect_success 'verify date in flux logs (sqlite)' '
 '
 
 test_expect_success 're-run instance, get rootref (sqlite)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	           flux kvs getroot -b > getrootsqlite.out
 '
 
@@ -57,7 +57,7 @@ test_expect_success 'write rootref to checkpoint path, emulating original checkp
 '
 
 test_expect_success 're-run instance, verify checkpoint correctly loaded (sqlite)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	           flux dmesg >dmesgsqlite2.out
 '
 
@@ -84,8 +84,8 @@ EOF
         chmod +x rc3-content-files
 '
 
-test_expect_success 'run instance with content.backing-path set (files)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.files \
+test_expect_success 'run instance with statedir set (files)' '
+	flux start -o,--setattr=statedir=$(pwd) \
                    -o,--setattr=broker.rc1_path=$(pwd)/rc1-content-files \
                    -o,--setattr=broker.rc3_path=$(pwd)/rc3-content-files \
 	           flux kvs put testkey=43
@@ -96,8 +96,8 @@ test_expect_success 'content.files dir and kvs-primary exist after instance exit
 	test -e content.files/kvs-primary
 '
 
-test_expect_success 're-run instance with content.backing-path set (files)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.files \
+test_expect_success 're-run instance with statedir set (files)' '
+	flux start -o,--setattr=statedir=$(pwd) \
                    -o,--setattr=broker.rc1_path=$(pwd)/rc1-content-files \
                    -o,--setattr=broker.rc3_path=$(pwd)/rc3-content-files \
 	           flux kvs get testkey >getfiles.out
@@ -109,7 +109,7 @@ test_expect_success 'content from previous instance survived (files)' '
 '
 
 test_expect_success 're-run instance, verify checkpoint date saved (files)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.files \
+	flux start -o,--setattr=statedir=$(pwd) \
                    -o,--setattr=broker.rc1_path=$(pwd)/rc1-content-files \
                    -o,--setattr=broker.rc3_path=$(pwd)/rc3-content-files \
 	           flux dmesg >dmesgfiles.out
diff --git a/t/t2807-dump-cmd.t b/t/t2807-dump-cmd.t
index 72143de0390e..7f0cdf2a2a0f 100755
--- a/t/t2807-dump-cmd.t
+++ b/t/t2807-dump-cmd.t
@@ -4,12 +4,12 @@ test_description='Test flux dump/restore'
 
 . $(dirname $0)/sharness.sh
 
-test_under_flux 1 minimal
+test_under_flux 1 minimal -o,-Sstatedir=$(pwd)
 
 QUERYCMD="flux python ${FLUX_SOURCE_DIR}/t/scripts/sqlite-query.py"
 
 countblobs() {
-	$QUERYCMD -t 100 $(flux getattr content.backing-path) \
+	$QUERYCMD -t 100 content.sqlite \
 		"select count(*) from objects;" | sed -e 's/.*= //'
 }
 
@@ -81,7 +81,7 @@ test_expect_success 'count blobs representing those four keys' '
 	test_cmp blobcount.exp blobcount.out
 '
 test_expect_success 'remove backing file and load content-sqlite' '
-	rm -f $(flux getattr content.backing-path) &&
+	rm -f content.sqlite &&
 	flux module load content-sqlite
 '
 test_expect_success 'restore content' '
@@ -183,14 +183,15 @@ test_expect_success 'restore --no-cache with no backing store fails' '
 	test_must_fail flux restore --no-cache --checkpoint foo.tar
 '
 test_expect_success 'run a flux instance, preserving content.sqlite' '
-	flux start -o,-Scontent.backing-path=content.sqlite /bin/true
+	mkdir test &&
+	flux start -o,-Sstatedir=$(pwd)/test /bin/true
 '
 
 reader() {
-	local dbfile=$1
+	local dbdir=$1
         flux start -o,-Sbroker.rc1_path= \
                 -o,-Sbroker.rc3_path=\
-                -o,-Scontent.backing-path=$dbfile \
+                -o,-Sstatedir=$dbdir\
                 bash -c "\
                         flux module load content-sqlite && \
                         flux dump --no-cache -q --checkpoint - &&\
@@ -199,10 +200,10 @@ reader() {
 }
 
 writer() {
-	local dbfile=$1
+	local dbdir=$1
         flux start -o,-Sbroker.rc1_path= \
                 -o,-Sbroker.rc3_path= \
-                -o,-Scontent.backing-path=$dbfile \
+                -o,-Sstatedir=$dbdir \
                 bash -c "\
                         flux module load content-sqlite && \
                         flux restore --checkpoint - && \
@@ -211,12 +212,13 @@ writer() {
 }
 
 test_expect_success 'perform offline garbage collection with dump/restore' '
-	mv content.sqlite content.sqlite.bak &&
-	reader content.sqlite.bak | writer content.sqlite
+	mkdir test_bak &&
+	mv test/content.sqlite test_bak/ &&
+	reader test_bak | writer test
 '
 
 test_expect_success 'restart flux instance and try to run a job' '
-	flux start -o,-Scontent.backing-path=content.sqlite \
+	flux start -o,-Sstatedir=test \
 		flux mini run /bin/true
 '
 
diff --git a/t/t3200-instance-restart.t b/t/t3200-instance-restart.t
index 4377e92f13f0..2810965d64d1 100755
--- a/t/t3200-instance-restart.t
+++ b/t/t3200-instance-restart.t
@@ -13,22 +13,22 @@ if test -n "$S3_ACCESS_KEY_ID"; then
 fi
 
 test_expect_success 'run a job in persistent instance' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	           flux mini submit /bin/true >id1.out
 '
 
 test_expect_success 'restart instance and run another job' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	           flux mini submit /bin/true >id2.out
 '
 
 test_expect_success 'restart instance and run another job' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	           flux mini submit /bin/true >id3.out
 '
 
 test_expect_success 'restart instance and list inactive jobs' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	           flux jobs --suppress-header --format={id} \
 		   	--filter=INACTIVE >list.out
 '
@@ -45,7 +45,7 @@ test_expect_success 'job IDs were issued in ascending order' '
 '
 
 test_expect_success 'restart instance and capture startlog' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	           flux startlog >startlog.out
 '
 test_expect_success 'startlog shows 5 run periods' '
@@ -56,13 +56,13 @@ test_expect_success 'most recent period is still running' '
 '
 
 test_expect_success 'doctor startlog to look like a crash' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 		-o,-Sbroker.rc1_path=$SHARNESS_TEST_SRCDIR/rc/rc1-kvs \
 		-o,-Sbroker.rc3_path=$SHARNESS_TEST_SRCDIR/rc/rc3-kvs \
 		flux startlog --post-start-event
 '
 test_expect_success 'check queue status' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 		flux queue status >queue_status.out 2>&1
 '
 test_expect_success 'safe mode is entered' '
@@ -72,13 +72,13 @@ test_expect_success 'safe mode is entered' '
 test_expect_success 'run a job in persistent instance (content-files)' '
 	flux start \
 	    -o,-Scontent.backing-module=content-files \
-	    -o,-Scontent.backing-path=$(pwd)/content.files \
+	    -o,-Sstatedir=$(pwd) \
 	    flux mini submit /bin/true >files_id1.out
 '
 test_expect_success 'restart instance and list inactive jobs' '
 	flux start \
 	    -o,-Scontent.backing-module=content-files \
-	    -o,-Scontent.backing-path=$(pwd)/content.files \
+	    -o,-Sstatedir=$(pwd) \
 	    flux jobs --suppress-header --format={id} \
 	        --filter=INACTIVE >files_list.out
 '
diff --git a/t/t3202-instance-restart-testexec.t b/t/t3202-instance-restart-testexec.t
index ba4ab6c94e40..c2c86c17d056 100755
--- a/t/t3202-instance-restart-testexec.t
+++ b/t/t3202-instance-restart-testexec.t
@@ -9,7 +9,7 @@ test -n "$FLUX_TESTS_LOGFILE" && set -- "$@" --logfile
 export FLUX_DISABLE_JOB_CLEANUP=t
 
 test_expect_success 'run a testexec job in persistent instance (long run)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	     flux mini submit \
 	       --flags=debug \
 	       --setattr=system.exec.test.run_duration=100s \
@@ -17,7 +17,7 @@ test_expect_success 'run a testexec job in persistent instance (long run)' '
 '
 
 test_expect_success 'restart instance, reattach to running job, cancel it (long run)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	     sh -c "flux job eventlog $(cat id1.out) > eventlog_long1.out; \
 		    flux jobs -n > jobs_long1.out; \
 		    flux job cancel $(cat id1.out)" &&
@@ -27,7 +27,7 @@ test_expect_success 'restart instance, reattach to running job, cancel it (long
 '
 
 test_expect_success 'restart instance, job completed (long run)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	     sh -c "flux job eventlog $(cat id1.out) > eventlog_long2.out; \
 		    flux jobs -n > jobs_long2.out" &&
 	grep "finish" eventlog_long2.out | grep status &&
@@ -38,7 +38,7 @@ test_expect_success 'restart instance, job completed (long run)' '
 # right after reattach, emulating a job that finished before the
 # instance restarted
 test_expect_success 'run a testexec job in persistent instance (exit run)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	     flux mini submit \
 	       --flags=debug \
 	       --setattr=system.exec.test.reattach_finish=1 \
@@ -47,7 +47,7 @@ test_expect_success 'run a testexec job in persistent instance (exit run)' '
 '
 
 test_expect_success 'restart instance, reattach to running job, its finished (exit run)' '
-	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
+	flux start -o,--setattr=statedir=$(pwd) \
 	     sh -c "flux job eventlog $(cat id2.out) > eventlog_exit1.out" &&
 	grep "reattach-start" eventlog_exit1.out &&
 	grep "reattach-finish" eventlog_exit1.out &&