diff --git a/CHANGES b/CHANGES
index 7ab6f6b1df..2ad34ec4bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6276.	[cleanup]	Remove both lock-file configuration option and the
+			-X argument to named. [GL #4391]
+
 6275.	[bug]		Fix assertion failure when using lock-file configuration
 			option together -X argument to named. [GL #4386]
 
diff --git a/bin/named/config.c b/bin/named/config.c
index aaa44543dc..9daa0c079b 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -67,7 +67,6 @@ options {\n\
 	interface-interval 60;\n\
 	listen-on {any;};\n\
 	listen-on-v6 {any;};\n\
-#	lock-file \"" NAMED_LOCALSTATEDIR "/run/named/named.lock\";\n\
 	match-mapped-addresses no;\n\
 	max-ixfr-ratio 100%;\n\
 	max-rsa-exponent-size 0; /* no limit */\n\
diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 1f6edbc09e..0fc26f212d 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -118,11 +118,6 @@ EXTERN const char *named_g_logfile   INIT(NULL);
 EXTERN const char *named_g_defaultsessionkeyfile INIT(NAMED_LOCALSTATEDIR
 						      "/run/named/"
 						      "session.key");
-EXTERN const char *named_g_defaultlockfile INIT(NAMED_LOCALSTATEDIR "/run/"
-								    "named/"
-								    "named."
-								    "lock");
-EXTERN bool named_g_forcelock		   INIT(false);
 
 #if NAMED_RUN_PID_DIR
 EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/"
diff --git a/bin/named/include/named/os.h b/bin/named/include/named/os.h
index 0f7c1c5385..6066fc391d 100644
--- a/bin/named/include/named/os.h
+++ b/bin/named/include/named/os.h
@@ -56,9 +56,6 @@ named_os_openfile(const char *filename, mode_t mode, bool switch_user);
 void
 named_os_writepidfile(const char *filename, bool first_time);
 
-bool
-named_os_issingleton(const char *filename);
-
 void
 named_os_shutdown(void);
 
diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
index 509101f277..b0f531e41d 100644
--- a/bin/named/include/named/server.h
+++ b/bin/named/include/named/server.h
@@ -103,8 +103,6 @@ struct named_server {
 
 	dns_dtenv_t *dtenv; /*%< Dnstap environment */
 
-	char *lockfile;
-
 	isc_tlsctx_cache_t *tlsctx_server_cache;
 	isc_tlsctx_cache_t *tlsctx_client_cache;
 
diff --git a/bin/named/main.c b/bin/named/main.c
index 521536caa1..36c0a55361 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -312,7 +312,7 @@ usage(void) {
 			"[-p port] [-s]\n"
 			"             [-S sockets] [-t chrootdir] [-u "
 			"username] [-U listeners]\n"
-			"             [-X lockfile] [-m "
+			"             [-m "
 			"{usage|trace|record|size|mctx}]\n"
 			"             [-M fill|nofill]\n"
 			"usage: named [-v|-V|-C]\n");
@@ -671,7 +671,6 @@ printversion(bool verbose) {
 	printf("  rndc configuration:   %s\n", rndcconf);
 	printf("  nsupdate session key: %s\n", named_g_defaultsessionkeyfile);
 	printf("  named PID file:       %s\n", named_g_defaultpidfile);
-	printf("  named lock file:      %s\n", named_g_defaultlockfile);
 #if defined(HAVE_GEOIP2)
 #define RTC(x) RUNTIME_CHECK((x) == ISC_R_SUCCESS)
 	RTC(cfg_parser_create(mctx, named_g_lctx, &parser));
@@ -964,13 +963,8 @@ parse_command_line(int argc, char *argv[]) {
 			/* Obsolete. No longer in use. Ignore. */
 			break;
 		case 'X':
-			named_g_forcelock = true;
-			if (strcasecmp(isc_commandline_argument, "none") != 0) {
-				named_g_defaultlockfile =
-					isc_commandline_argument;
-			} else {
-				named_g_defaultlockfile = NULL;
-			}
+			/* Obsolete. No longer in use. Abort. */
+			named_main_earlyfatal("option '-X' has been removed");
 			break;
 		case 'F':
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L && OPENSSL_API_LEVEL >= 30000
diff --git a/bin/named/named.rst b/bin/named/named.rst
index 698ffcdfd1..967119ca08 100644
--- a/bin/named/named.rst
+++ b/bin/named/named.rst
@@ -21,7 +21,7 @@ named - Internet domain name server
 Synopsis
 ~~~~~~~~
 
-:program:`named` [ [**-4**] | [**-6**] ] [**-c** config-file] [**-C**] [**-d** debug-level] [**-D** string] [**-E** engine-name] [**-f**] [**-g**] [**-L** logfile] [**-M** option] [**-m** flag] [**-n** #cpus] [**-p** port] [**-s**] [**-t** directory] [**-U** #listeners] [**-u** user] [**-v**] [**-V**] [**-X** lock-file]
+:program:`named` [ [**-4**] | [**-6**] ] [**-c** config-file] [**-C**] [**-d** debug-level] [**-D** string] [**-E** engine-name] [**-f**] [**-g**] [**-L** logfile] [**-M** option] [**-m** flag] [**-n** #cpus] [**-p** port] [**-s**] [**-t** directory] [**-U** #listeners] [**-u** user] [**-v**] [**-V**] ]
 
 Description
 ~~~~~~~~~~~
@@ -198,10 +198,7 @@ Options
 
 .. option:: -X lock-file
 
-   This option acquires a lock on the specified file at runtime; this helps to
-   prevent duplicate :program:`named` instances from running simultaneously.
-   Use of this option overrides the ``lock-file`` option in
-   :iscman:`named.conf`. If set to ``none``, the lock file check is disabled.
+   This option has been removed and using it will cause a fatal error.
 
 Signals
 ~~~~~~~
diff --git a/bin/named/os.c b/bin/named/os.c
index ee8a094e5b..4b3cd952bb 100644
--- a/bin/named/os.c
+++ b/bin/named/os.c
@@ -51,9 +51,7 @@
 #endif /* ifdef HAVE_LIBSCF */
 
 static char *pidfile = NULL;
-static char *lockfile = NULL;
 static int devnullfd = -1;
-static int singletonfd = -1;
 
 #ifndef ISC_FACILITY
 #define ISC_FACILITY LOG_DAEMON
@@ -705,26 +703,6 @@ cleanup_pidfile(void) {
 	pidfile = NULL;
 }
 
-static void
-cleanup_lockfile(bool unlink_lockfile) {
-	if (singletonfd != -1) {
-		close(singletonfd);
-		singletonfd = -1;
-	}
-
-	if (lockfile != NULL) {
-		if (unlink_lockfile) {
-			int n = unlink(lockfile);
-			if (n == -1 && errno != ENOENT) {
-				named_main_earlywarning("unlink '%s': failed",
-							lockfile);
-			}
-		}
-		free(lockfile);
-		lockfile = NULL;
-	}
-}
-
 /*
  * Ensure that a directory exists.
  * NOTE: This function overwrites the '/' characters in 'filename' with
@@ -908,68 +886,10 @@ named_os_writepidfile(const char *filename, bool first_time) {
 	(void)fclose(fh);
 }
 
-bool
-named_os_issingleton(const char *filename) {
-	char strbuf[ISC_STRERRORSIZE];
-	struct flock lock;
-
-	if (singletonfd != -1) {
-		return (true);
-	}
-
-	if (strcasecmp(filename, "none") == 0) {
-		return (true);
-	}
-
-	/*
-	 * Make the containing directory if it doesn't exist.
-	 */
-	lockfile = strdup(filename);
-	if (lockfile == NULL) {
-		strerror_r(errno, strbuf, sizeof(strbuf));
-		named_main_earlyfatal("couldn't allocate memory for '%s': %s",
-				      filename, strbuf);
-	} else {
-		int ret = mkdirpath(lockfile, named_main_earlywarning);
-		if (ret == -1) {
-			named_main_earlywarning("couldn't create '%s'",
-						filename);
-			cleanup_lockfile(false);
-			return (false);
-		}
-	}
-
-	/*
-	 * named_os_openfile() uses safeopen() which removes any existing
-	 * files. We can't use that here.
-	 */
-	singletonfd = open(filename, O_WRONLY | O_CREAT,
-			   S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-	if (singletonfd == -1) {
-		cleanup_lockfile(false);
-		return (false);
-	}
-
-	memset(&lock, 0, sizeof(lock));
-	lock.l_type = F_WRLCK;
-	lock.l_whence = SEEK_SET;
-	lock.l_start = 0;
-	lock.l_len = 1;
-
-	/* Non-blocking (does not wait for lock) */
-	if (fcntl(singletonfd, F_SETLK, &lock) == -1) {
-		cleanup_lockfile(false);
-		return (false);
-	}
-
-	return (true);
-}
-
 void
 named_os_shutdown(void) {
 	closelog();
 	cleanup_pidfile();
-	cleanup_lockfile(true);
 }
 
 void
diff --git a/bin/named/server.c b/bin/named/server.c
index 15bcfa7ffa..3223e35789 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -8128,83 +8128,6 @@ cleanup:
 
 #endif /* HAVE_LMDB */
 
-static isc_result_t
-check_lockfile(named_server_t *server, const cfg_obj_t *config,
-	       bool first_time) {
-	isc_result_t result;
-	const char *filename = NULL;
-	const cfg_obj_t *maps[3];
-	const cfg_obj_t *options;
-	const cfg_obj_t *obj;
-	int i;
-
-	i = 0;
-	options = NULL;
-	result = cfg_map_get(config, "options", &options);
-	if (result == ISC_R_SUCCESS) {
-		maps[i++] = options;
-	}
-	maps[i++] = named_g_defaults;
-	maps[i] = NULL;
-
-	obj = NULL;
-	(void)named_config_get(maps, "lock-file", &obj);
-
-	if (!first_time) {
-		if (obj != NULL && cfg_obj_isstring(obj) &&
-		    server->lockfile != NULL && !named_g_forcelock &&
-		    strcmp(cfg_obj_asstring(obj), server->lockfile) != 0)
-		{
-			isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
-				      NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING,
-				      "changing 'lock-file' "
-				      "has no effect until the "
-				      "server is restarted");
-		}
-
-		return (ISC_R_SUCCESS);
-	}
-
-	if (obj != NULL) {
-		if (named_g_forcelock) {
-			isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
-				      NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING,
-				      "'lock-file' has no effect "
-				      "because the server was run with -X");
-			if (named_g_defaultlockfile != NULL) {
-				server->lockfile = isc_mem_strdup(
-					server->mctx, named_g_defaultlockfile);
-			}
-		} else if (cfg_obj_isvoid(obj)) {
-			isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
-				      NAMED_LOGMODULE_SERVER, ISC_LOG_DEBUG(1),
-				      "skipping lock-file check");
-		} else if (cfg_obj_isstring(obj)) {
-			filename = cfg_obj_asstring(obj);
-			server->lockfile = isc_mem_strdup(server->mctx,
-							  filename);
-		}
-	} else if (named_g_forcelock && named_g_defaultlockfile != NULL) {
-		server->lockfile = isc_mem_strdup(server->mctx,
-						  named_g_defaultlockfile);
-	}
-
-	if (server->lockfile == NULL) {
-		return (ISC_R_SUCCESS);
-	}
-
-	if (named_os_issingleton(server->lockfile)) {
-		return (ISC_R_SUCCESS);
-	}
-
-	isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
-		      NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR,
-		      "could not lock %s; another named "
-		      "process may be running",
-		      server->lockfile);
-	return (ISC_R_FAILURE);
-}
-
 static isc_result_t
 load_configuration(const char *filename, named_server_t *server,
 		   bool first_time) {
@@ -8420,14 +8343,6 @@ load_configuration(const char *filename, named_server_t *server,
 		setstring(server, &server->bindkeysfile, NULL);
 	}
 
-	/*
-	 * Check the process lockfile.
-	 */
-	result = check_lockfile(server, config, first_time);
-	if (result != ISC_R_SUCCESS) {
-		goto cleanup_bindkeys_parser;
-	}
-
 #if defined(HAVE_GEOIP2)
 	/*
 	 * Release any previously opened GeoIP2 databases.
@@ -10214,9 +10129,6 @@ named_server_destroy(named_server_t **serverp) {
 	if (server->hostname != NULL) {
 		isc_mem_free(server->mctx, server->hostname);
 	}
-	if (server->lockfile != NULL) {
-		isc_mem_free(server->mctx, server->lockfile);
-	}
 
 	if (server->zonemgr != NULL) {
 		dns_zonemgr_detach(&server->zonemgr);
diff --git a/bin/tests/system/README b/bin/tests/system/README
index 90b8828f1d..36b01ea47b 100644
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -566,7 +566,7 @@ By default, start.pl starts a "named" server with the following options:
 
     -U 4            Uses four listeners.
 
-    -X named.lock   Acquires a lock on this file in the "nsN" directory, so
+      Acquires a lock on this file in the "nsN" directory, so
                     preventing multiple instances of this named running in this
                     directory (which could possibly interfere with the test).
 
diff --git a/bin/tests/system/acl/clean.sh b/bin/tests/system/acl/clean.sh
index c8d26cc54f..3bbdabc86a 100644
--- a/bin/tests/system/acl/clean.sh
+++ b/bin/tests/system/acl/clean.sh
@@ -20,7 +20,6 @@ rm -f ns2/example.db ns2/tsigzone.db ns2/example.db.jnl
 rm -f */named.conf
 rm -f */named.memstats
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f ns*/_default.nzf
 rm -f ns*/_default.nzd*
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
diff --git a/bin/tests/system/additional/clean.sh b/bin/tests/system/additional/clean.sh
index c43c36e9cd..b230bf2660 100644
--- a/bin/tests/system/additional/clean.sh
+++ b/bin/tests/system/additional/clean.sh
@@ -19,5 +19,4 @@ rm -f dig.out.*
 rm -f */named.memstats
 rm -f */named.conf
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/additional/ns1/named.args b/bin/tests/system/additional/ns1/named.args
index 45ac93a7c7..75453441de 100644
--- a/bin/tests/system/additional/ns1/named.args
+++ b/bin/tests/system/additional/ns1/named.args
@@ -1,2 +1,2 @@
 # this server runs named with only one worker thread
--m record -c named.conf -d 99 -D additional-ns1 -X named.lock -g -n 1 -T maxcachesize=2097152
+-m record -c named.conf -d 99 -D additional-ns1 -g -n 1 -T maxcachesize=2097152
diff --git a/bin/tests/system/addzone/clean.sh b/bin/tests/system/addzone/clean.sh
index 5e94b5c759..57056cc2e6 100644
--- a/bin/tests/system/addzone/clean.sh
+++ b/bin/tests/system/addzone/clean.sh
@@ -28,7 +28,6 @@ rm -f ./ns2/inline.db.jbk
 rm -f ./ns2/inline.db.signed
 rm -f ./ns2/inlinesec.bk*
 rm -rf ./ns2/new-zones
-rm -f ./ns*/named.lock
 rm -f ./ns*/named.run ./ns*/named.run.prev
 rm -f ./ns2/nzf-*
 rm -f ./ns3/named.conf
diff --git a/bin/tests/system/allow-query/clean.sh b/bin/tests/system/allow-query/clean.sh
index 9914de7469..c12009ef51 100644
--- a/bin/tests/system/allow-query/clean.sh
+++ b/bin/tests/system/allow-query/clean.sh
@@ -19,6 +19,5 @@ rm -f dig.out.*
 rm -f ns*/named.conf
 rm -f ns2/controls.conf
 rm -f */named.memstats
-rm -f ns*/named.lock
 rm -f ns*/named.run ns*/named.run.prev
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
diff --git a/bin/tests/system/allow-query/ns3/named.args b/bin/tests/system/allow-query/ns3/named.args
index e875a57bc7..b424c39086 100644
--- a/bin/tests/system/allow-query/ns3/named.args
+++ b/bin/tests/system/allow-query/ns3/named.args
@@ -1,2 +1,2 @@
 # this server only has 127.0.0.1 in its localhost/localnets ACLs
--m record -c named.conf -d 99 -D allow-query-ns3 -X named.lock -g -T maxcachesize=2097152 -T fixedlocal
+-m record -c named.conf -d 99 -D allow-query-ns3 -g -T maxcachesize=2097152 -T fixedlocal
diff --git a/bin/tests/system/autosign/clean.sh b/bin/tests/system/autosign/clean.sh
index 02ae2c1ee1..8d31dfef0a 100644
--- a/bin/tests/system/autosign/clean.sh
+++ b/bin/tests/system/autosign/clean.sh
@@ -28,7 +28,6 @@ rm -f noksk-ksk.key nozsk-ksk.key nozsk-zsk.key inaczsk-zsk.key inaczsk-ksk.key
 rm -f nopriv.key vanishing.key del1.key del2.key
 rm -rf ns*/inactive
 rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock
 rm -f ns1/root.db ns1/root.db.1 ns1/root.db.2 ns1/root.db.3
 rm -f ns1/signing.out
 rm -f ns2/bar.db
diff --git a/bin/tests/system/builtin/clean.sh b/bin/tests/system/builtin/clean.sh
index 1ad33dc1aa..a0fe02a4b1 100644
--- a/bin/tests/system/builtin/clean.sh
+++ b/bin/tests/system/builtin/clean.sh
@@ -16,5 +16,4 @@ rm -f ns?/named.memstats
 rm -f ns?/named.conf
 rm -f rndc.status.ns*
 rm -f dig.out.ns*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/cacheclean/clean.sh b/bin/tests/system/cacheclean/clean.sh
index b346e65b5b..75b2af32ef 100644
--- a/bin/tests/system/cacheclean/clean.sh
+++ b/bin/tests/system/cacheclean/clean.sh
@@ -23,5 +23,4 @@ rm -f */named.memstats
 rm -f */named.run
 rm -f */named.conf
 rm -f ns2/named_dump.db.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/cacheclean/ns1/named.args b/bin/tests/system/cacheclean/ns1/named.args
index b7ce00d2b7..43721b6f86 100644
--- a/bin/tests/system/cacheclean/ns1/named.args
+++ b/bin/tests/system/cacheclean/ns1/named.args
@@ -1 +1 @@
--m record -c named.conf -d 1 -D cacheclean-ns1 -X named.lock -g -T maxcachesize=2097152
+-m record -c named.conf -d 1 -D cacheclean-ns1 -g -T maxcachesize=2097152
diff --git a/bin/tests/system/cacheclean/ns2/named.args b/bin/tests/system/cacheclean/ns2/named.args
index 071016c00b..2482aade6c 100644
--- a/bin/tests/system/cacheclean/ns2/named.args
+++ b/bin/tests/system/cacheclean/ns2/named.args
@@ -1 +1 @@
--m record -c named.conf -d 3 -D cacheclean-ns2 -X named.lock -g -T maxcachesize=2097152
+-m record -c named.conf -d 3 -D cacheclean-ns2 -g -T maxcachesize=2097152
diff --git a/bin/tests/system/case/clean.sh b/bin/tests/system/case/clean.sh
index 2c7bf979a6..dcb88881f8 100644
--- a/bin/tests/system/case/clean.sh
+++ b/bin/tests/system/case/clean.sh
@@ -13,7 +13,6 @@
 
 rm -f dig.ns*.test*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns1/dynamic.db
diff --git a/bin/tests/system/catz/clean.sh b/bin/tests/system/catz/clean.sh
index 21dbc752c1..f9df1b40cb 100644
--- a/bin/tests/system/catz/clean.sh
+++ b/bin/tests/system/catz/clean.sh
@@ -18,7 +18,6 @@ rm -f ns*/*.nzd ns*/*.nzd-lock
 rm -f ns*/*.nzf
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.run.prev
diff --git a/bin/tests/system/chain/clean.sh b/bin/tests/system/chain/clean.sh
index 57b05a732d..22d7e0a0f1 100755
--- a/bin/tests/system/chain/clean.sh
+++ b/bin/tests/system/chain/clean.sh
@@ -13,6 +13,6 @@
 
 rm -f dig.out.* named*.pid
 rm -f ns*/named.conf
-rm -f */named.memstats */named.recursing */named.lock */named.run */ans.run
+rm -f */named.memstats */named.recursing */named.run */ans.run
 rm -f ns2/K* ns2/dsset-* ns2/*.db.signed
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/checkconf/clean.sh b/bin/tests/system/checkconf/clean.sh
index 088c2f4731..396fb82c77 100644
--- a/bin/tests/system/checkconf/clean.sh
+++ b/bin/tests/system/checkconf/clean.sh
@@ -23,5 +23,4 @@ rm -f good-kasp.conf.in
 rm -f good-server-christmas-tree.conf
 rm -f good.conf good.conf.raw good.conf.out badzero.conf *.out
 rm -rf keys
-rm -f ns*/named.lock
 rm -rf test.keydir
diff --git a/bin/tests/system/checknames/clean.sh b/bin/tests/system/checknames/clean.sh
index fcbd504469..b7b4a6316a 100644
--- a/bin/tests/system/checknames/clean.sh
+++ b/bin/tests/system/checknames/clean.sh
@@ -23,5 +23,4 @@ rm -f ns5/*.update.db
 rm -f ns5/*.update.db.jnl
 rm -f */named.memstats
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/checkzone/clean.sh b/bin/tests/system/checkzone/clean.sh
index cb189a306e..ee6a11293f 100644
--- a/bin/tests/system/checkzone/clean.sh
+++ b/bin/tests/system/checkzone/clean.sh
@@ -12,6 +12,5 @@
 # information regarding copyright ownership.
 
 rm -f test.* good1.db.raw named-compilezone
-rm -f ns*/named.lock
 rm -f zones/bad-tsig.db
 rm -f zones/zone1_*.txt
diff --git a/bin/tests/system/cookie/clean.sh b/bin/tests/system/cookie/clean.sh
index d0675aa4fb..0a76278707 100644
--- a/bin/tests/system/cookie/clean.sh
+++ b/bin/tests/system/cookie/clean.sh
@@ -18,7 +18,6 @@ rm -f rndc.out.*
 rm -f ns1/named_dump.db*
 rm -f ns*/named.memstats
 rm -f ns*/named.run
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.run.prev
 rm -f ans*/ans.run ans*/ans.log
diff --git a/bin/tests/system/database/clean.sh b/bin/tests/system/database/clean.sh
index f86404c1b2..eda32d07ba 100644
--- a/bin/tests/system/database/clean.sh
+++ b/bin/tests/system/database/clean.sh
@@ -13,5 +13,4 @@
 
 rm -f ns1/named.conf ns1/named.run ns1/named.memstats
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/dialup/clean.sh b/bin/tests/system/dialup/clean.sh
index 9318255bfa..9ee72bc536 100644
--- a/bin/tests/system/dialup/clean.sh
+++ b/bin/tests/system/dialup/clean.sh
@@ -15,4 +15,3 @@ rm -f ns2/example.bk
 rm -f ns3/example.bk
 rm -f */named.memstats */named.run
 rm -f ns*/named.conf
-rm -f ns*/named.lock
diff --git a/bin/tests/system/digdelv/clean.sh b/bin/tests/system/digdelv/clean.sh
index 70797f0b93..61574ad3f2 100644
--- a/bin/tests/system/digdelv/clean.sh
+++ b/bin/tests/system/digdelv/clean.sh
@@ -27,7 +27,6 @@ rm -f ./dig.out.nm.*
 rm -f ./dig.out.nn.*
 rm -f ./host.out.test*
 rm -f ./ns*/managed-keys.bind*
-rm -f ./ns*/named.lock
 rm -f ./ns*/K* ./ns*/keyid ./ns*/keydata
 rm -f ./ns1/root.db
 rm -f ./ns*/dsset-*
diff --git a/bin/tests/system/dlzexternal/clean.sh b/bin/tests/system/dlzexternal/clean.sh
index 2bbf75b214..4c0fc59457 100644
--- a/bin/tests/system/dlzexternal/clean.sh
+++ b/bin/tests/system/dlzexternal/clean.sh
@@ -21,6 +21,5 @@ rm -f */named.conf
 rm -f */named.run
 rm -f ns1/ddns.key
 rm -f dig.out*
-rm -f ns*/named.lock
 rm -f ns1/session.key
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/dns64/clean.sh b/bin/tests/system/dns64/clean.sh
index b773e2d70f..4255105384 100644
--- a/bin/tests/system/dns64/clean.sh
+++ b/bin/tests/system/dns64/clean.sh
@@ -18,5 +18,4 @@ rm -f ns1/dsset-signed.
 rm -f */named.memstats
 rm -f */named.run
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index c245688c79..9a274bda61 100644
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -33,7 +33,6 @@ rm -f ./keygen.err
 rm -f ./named.secroots.test*
 rm -f ./ns*/*.nta
 rm -f ./ns*/managed-keys.bind ./ns*/managed-keys.bind.jnl ./ns*/*.mkeys*
-rm -f ./ns*/named.lock
 rm -f ./ns1/managed.key.id
 rm -f ./ns1/root.db ./ns2/example.db ./ns2/managed.db ./ns2/trusted.db
 rm -f ./ns1/trusted.keys
diff --git a/bin/tests/system/dnssec/ns6/named.args b/bin/tests/system/dnssec/ns6/named.args
index 4b96405caa..04d5d1b50e 100644
--- a/bin/tests/system/dnssec/ns6/named.args
+++ b/bin/tests/system/dnssec/ns6/named.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -D dnssec-ns6 -X named.lock -g -T maxcachesize=2097152 -T nonearest -T tat=1
+-m record -c named.conf -d 99 -D dnssec-ns6 -g -T maxcachesize=2097152 -T nonearest -T tat=1
diff --git a/bin/tests/system/dnstap/clean.sh b/bin/tests/system/dnstap/clean.sh
index b9e476f661..d17322c369 100644
--- a/bin/tests/system/dnstap/clean.sh
+++ b/bin/tests/system/dnstap/clean.sh
@@ -23,7 +23,6 @@ rm -f ns*/dnstap.out
 rm -f ns*/dnstap.out.save
 rm -f ns*/dnstap.out.save.?
 rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock
 rm -f ns2/dnstap.out.*
 rm -f ns2/example.db ns2/example.db.jnl
 rm -f ns3/dnstap.out.*
diff --git a/bin/tests/system/dnstap/ns3/named.args b/bin/tests/system/dnstap/ns3/named.args
index 7937dee5fb..d70946ad15 100644
--- a/bin/tests/system/dnstap/ns3/named.args
+++ b/bin/tests/system/dnstap/ns3/named.args
@@ -1,2 +1,2 @@
 # Using "-n 1" allows GL #1795 to be reliably reproduced
--D dnstap-ns3 -X named.lock -m record -c named.conf -d 99 -g -U 4 -n 1 -T maxcachesize=2097152
+-D dnstap-ns3 -m record -c named.conf -d 99 -g -U 4 -n 1 -T maxcachesize=2097152
diff --git a/bin/tests/system/dsdigest/clean.sh b/bin/tests/system/dsdigest/clean.sh
index 172cf1e8fe..34379fd3b8 100644
--- a/bin/tests/system/dsdigest/clean.sh
+++ b/bin/tests/system/dsdigest/clean.sh
@@ -20,5 +20,4 @@ rm -f dig.out*
 rm -f */named.conf
 rm -f */named.run
 rm -f */named.memstats
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/ecdsa/clean.sh b/bin/tests/system/ecdsa/clean.sh
index 86aded697e..16b3aab06c 100644
--- a/bin/tests/system/ecdsa/clean.sh
+++ b/bin/tests/system/ecdsa/clean.sh
@@ -19,7 +19,6 @@ rm -f ns*/K*
 rm -f ns*/dsset-*
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/root.db
diff --git a/bin/tests/system/eddsa/clean.sh b/bin/tests/system/eddsa/clean.sh
index 42f5f751f0..c1238313d5 100644
--- a/bin/tests/system/eddsa/clean.sh
+++ b/bin/tests/system/eddsa/clean.sh
@@ -19,7 +19,6 @@ rm -f ns*/K*
 rm -f ns*/dsset-*
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/root.db
diff --git a/bin/tests/system/ednscompliance/clean.sh b/bin/tests/system/ednscompliance/clean.sh
index ad6176ae30..aeb90baf9b 100644
--- a/bin/tests/system/ednscompliance/clean.sh
+++ b/bin/tests/system/ednscompliance/clean.sh
@@ -12,7 +12,6 @@
 # information regarding copyright ownership.
 
 rm -f dig.out*
-rm -f ns*/named.lock
 rm -f ns*/named.conf
 rm -f ns*/named.run
 rm -f ns*/named.memstats
diff --git a/bin/tests/system/emptyzones/clean.sh b/bin/tests/system/emptyzones/clean.sh
index c7ff161ac2..d84a12984d 100644
--- a/bin/tests/system/emptyzones/clean.sh
+++ b/bin/tests/system/emptyzones/clean.sh
@@ -12,7 +12,6 @@
 # information regarding copyright ownership.
 
 rm -f ns1/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.run
 rm -f ns*/named.memstats
 rm -f dig.out.test*
diff --git a/bin/tests/system/enginepkcs11/ns1/named.args.in b/bin/tests/system/enginepkcs11/ns1/named.args.in
index e4dd595315..26d521e56c 100644
--- a/bin/tests/system/enginepkcs11/ns1/named.args.in
+++ b/bin/tests/system/enginepkcs11/ns1/named.args.in
@@ -1 +1 @@
-@ENGINE_ARGS@ -D enginepkcs11-ns1 -X named.lock -m record -c named.conf -d 99 -U 4 -T maxcachesize=2097152
+@ENGINE_ARGS@ -D enginepkcs11-ns1 -m record -c named.conf -d 99 -U 4 -T maxcachesize=2097152
diff --git a/bin/tests/system/fetchlimit/ns3/named.args b/bin/tests/system/fetchlimit/ns3/named.args
index d3488cefe1..d4fcf15217 100644
--- a/bin/tests/system/fetchlimit/ns3/named.args
+++ b/bin/tests/system/fetchlimit/ns3/named.args
@@ -1 +1 @@
--m record -c named.conf -d 1 -D fetchlimit-ns3 -X named.lock -g -T maxcachesize=2097152
+-m record -c named.conf -d 1 -D fetchlimit-ns3 -g -T maxcachesize=2097152
diff --git a/bin/tests/system/filter-aaaa/clean.sh b/bin/tests/system/filter-aaaa/clean.sh
index b7a2372e00..213f196028 100644
--- a/bin/tests/system/filter-aaaa/clean.sh
+++ b/bin/tests/system/filter-aaaa/clean.sh
@@ -26,7 +26,6 @@ rm -f ns4/signer.err
 rm -f ns4/dsset-*
 
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
 
 rm -f ns*/trusted.conf
diff --git a/bin/tests/system/formerr/clean.sh b/bin/tests/system/formerr/clean.sh
index 05d08a7925..c22ae71c84 100644
--- a/bin/tests/system/formerr/clean.sh
+++ b/bin/tests/system/formerr/clean.sh
@@ -15,7 +15,6 @@ rm -f nametoolong.out
 rm -f twoquestions.out
 rm -f noquestions.out
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.run
 rm -f ns*/named.memstats
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/forward/clean.sh b/bin/tests/system/forward/clean.sh
index 936dbc4d79..c1b4ecd864 100644
--- a/bin/tests/system/forward/clean.sh
+++ b/bin/tests/system/forward/clean.sh
@@ -21,7 +21,6 @@ rm -f ./*/named_dump.db
 rm -f ./ans*/query.log
 rm -f ./dig.out.*
 rm -f ./ns*/managed-keys.bind*
-rm -f ./ns*/named.lock
 rm -f ./ns*/trusted.conf
 rm -f ./ns1/K* ./ns1/dsset-*
 rm -f ./ns1/root.db ./ns1/root.db.signed
diff --git a/bin/tests/system/geoip2/clean.sh b/bin/tests/system/geoip2/clean.sh
index 46de65b7a0..0a512ff75b 100644
--- a/bin/tests/system/geoip2/clean.sh
+++ b/bin/tests/system/geoip2/clean.sh
@@ -16,5 +16,4 @@ rm -f ns2/example*.db
 rm -f dig.out.* rndc.out.*
 rm -f ns?/named.run
 rm -f ns?/named.memstats
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh
index 138980e90a..3c5fac9544 100644
--- a/bin/tests/system/glue/clean.sh
+++ b/bin/tests/system/glue/clean.sh
@@ -22,6 +22,5 @@ rm -f dig.out
 rm -f ns*/K*
 rm -f ns*/dsset-*
 rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock
 rm -f ns*/tc-test-signed.db
 rm -f ns*/tc-test-signed.db.signed
diff --git a/bin/tests/system/host/clean.sh b/bin/tests/system/host/clean.sh
index b03c4594cc..5cd0fa06d2 100644
--- a/bin/tests/system/host/clean.sh
+++ b/bin/tests/system/host/clean.sh
@@ -14,7 +14,6 @@
 rm -f ns1/example.db
 rm -f host.out*
 rm -f host.err*
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.conf
diff --git a/bin/tests/system/idna/clean.sh b/bin/tests/system/idna/clean.sh
index f99ecb5f50..2d6707cc26 100644
--- a/bin/tests/system/idna/clean.sh
+++ b/bin/tests/system/idna/clean.sh
@@ -15,5 +15,4 @@ rm -f */named.memstats
 rm -f */named.run
 rm -f */named.conf
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/include-multiplecfg/clean.sh b/bin/tests/system/include-multiplecfg/clean.sh
index 905b2dd29a..d748fc7af8 100644
--- a/bin/tests/system/include-multiplecfg/clean.sh
+++ b/bin/tests/system/include-multiplecfg/clean.sh
@@ -18,6 +18,5 @@
 rm -f dig.out.*
 rm -f ns*/named.conf
 rm -f */named.memstats
-rm -f ns*/named.lock
 rm -f ns*/named.run ns*/named.run.prev
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
diff --git a/bin/tests/system/inline/clean.sh b/bin/tests/system/inline/clean.sh
index 746f15ef92..5fb2e83aba 100644
--- a/bin/tests/system/inline/clean.sh
+++ b/bin/tests/system/inline/clean.sh
@@ -13,7 +13,7 @@
 
 rm -rf ./*/*.jbk \
   ./*/*.nzd ./*/*.nzd-lock ./*/*.nzf \
-  ./*/named.conf ./*/named.memstats ./*/named.run* ./*/named.lock \
+  ./*/named.conf ./*/named.memstats ./*/named.run* \
   ./*/trusted.conf \
   ./K* ./*/K* \
   ./checkecdsa \
diff --git a/bin/tests/system/ixfr/clean.sh b/bin/tests/system/ixfr/clean.sh
index eb7836389f..714459352f 100644
--- a/bin/tests/system/ixfr/clean.sh
+++ b/bin/tests/system/ixfr/clean.sh
@@ -22,5 +22,4 @@ rm -f */named.run */named.run.prev
 rm -f */ans.run
 rm -f dig.out.test* dig.out1.test* dig.out2.test* dig.out3.test*
 rm -f ns3/large.db
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind* ns*/*.mkeys
diff --git a/bin/tests/system/keepalive/clean.sh b/bin/tests/system/keepalive/clean.sh
index 9ccbd121b1..b891173a72 100644
--- a/bin/tests/system/keepalive/clean.sh
+++ b/bin/tests/system/keepalive/clean.sh
@@ -17,5 +17,4 @@ rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.conf
 rm -f ns*/named.stats
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/legacy/clean.sh b/bin/tests/system/legacy/clean.sh
index 4c65a2da26..b26c0d9b96 100644
--- a/bin/tests/system/legacy/clean.sh
+++ b/bin/tests/system/legacy/clean.sh
@@ -15,7 +15,6 @@ rm -f dig.out.*
 rm -f ns*/named.conf
 rm -f ns*/named.memstats
 rm -f ns*/named.run
-rm -f ns*/named.lock
 
 # build.sh
 rm -f ns1/named_dump.db*
diff --git a/bin/tests/system/legacy/ns4/named.args b/bin/tests/system/legacy/ns4/named.args
index 4ccb648595..dcd28aab4a 100644
--- a/bin/tests/system/legacy/ns4/named.args
+++ b/bin/tests/system/legacy/ns4/named.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -D legacy-ns4 -X named.lock -g -U 4 -T maxcachesize=2097152 -T noedns
+-m record -c named.conf -d 99 -D legacy-ns4 -g -U 4 -T maxcachesize=2097152 -T noedns
diff --git a/bin/tests/system/legacy/ns5/named.args b/bin/tests/system/legacy/ns5/named.args
index 0c5e17a940..1519a18988 100644
--- a/bin/tests/system/legacy/ns5/named.args
+++ b/bin/tests/system/legacy/ns5/named.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -D legacy-ns5 -X named.lock -g -U 4 -T maxcachesize=2097152 -T noedns
+-m record -c named.conf -d 99 -D legacy-ns5 -g -U 4 -T maxcachesize=2097152 -T noedns
diff --git a/bin/tests/system/legacy/ns6/named.args b/bin/tests/system/legacy/ns6/named.args
index 3475121784..0bad4d37b2 100644
--- a/bin/tests/system/legacy/ns6/named.args
+++ b/bin/tests/system/legacy/ns6/named.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -D legacy-ns6 -X named.lock -g -U 4 -T maxcachesize=2097152 -T maxudp512
+-m record -c named.conf -d 99 -D legacy-ns6 -g -U 4 -T maxcachesize=2097152 -T maxudp512
diff --git a/bin/tests/system/legacy/ns7/named.args b/bin/tests/system/legacy/ns7/named.args
index 1da498080f..7f21439519 100644
--- a/bin/tests/system/legacy/ns7/named.args
+++ b/bin/tests/system/legacy/ns7/named.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -D legacy-ns7 -X named.lock -g -U 4 -T maxcachesize=2097152 -T maxudp512
+-m record -c named.conf -d 99 -D legacy-ns7 -g -U 4 -T maxcachesize=2097152 -T maxudp512
diff --git a/bin/tests/system/limits/clean.sh b/bin/tests/system/limits/clean.sh
index b69c695afb..2337eb62e8 100644
--- a/bin/tests/system/limits/clean.sh
+++ b/bin/tests/system/limits/clean.sh
@@ -18,5 +18,4 @@ rm -f dig.out.*
 rm -f */named.memstats
 rm -f */named.conf
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/logfileconfig/clean.sh b/bin/tests/system/logfileconfig/clean.sh
index befbcfe84e..f87a3e893d 100644
--- a/bin/tests/system/logfileconfig/clean.sh
+++ b/bin/tests/system/logfileconfig/clean.sh
@@ -21,7 +21,6 @@ rm -f ns1/named.memstats ns1/dig.out
 rm -f ns1/named_log ns1/named_pipe ns1/named_sym
 rm -rf ns1/named_dir
 rm -f ns1/named_deflog
-rm -f ns*/named.lock
 rm -f ns1/query_log
 rm -f ns1/named_iso8601
 rm -f ns1/named_iso8601_utc
diff --git a/bin/tests/system/logfileconfig/named1.args b/bin/tests/system/logfileconfig/named1.args
index 764d4c969e..a76bb73f64 100644
--- a/bin/tests/system/logfileconfig/named1.args
+++ b/bin/tests/system/logfileconfig/named1.args
@@ -1 +1 @@
--c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -X named.lock -U 4
+-c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -U 4
diff --git a/bin/tests/system/logfileconfig/named2.args b/bin/tests/system/logfileconfig/named2.args
index fb9fe57371..787e5c980e 100644
--- a/bin/tests/system/logfileconfig/named2.args
+++ b/bin/tests/system/logfileconfig/named2.args
@@ -1 +1 @@
--c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -X named.lock -U 4 -L named_deflog
+-c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -U 4 -L named_deflog
diff --git a/bin/tests/system/masterfile/clean.sh b/bin/tests/system/masterfile/clean.sh
index 97aa377749..a1e9d4b1b7 100644
--- a/bin/tests/system/masterfile/clean.sh
+++ b/bin/tests/system/masterfile/clean.sh
@@ -15,6 +15,5 @@ rm -f dig.out.*
 rm -f */named.memstats
 rm -f */named.conf
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f checkzone.out*
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh
index e3cc44987b..c96ad2611e 100755
--- a/bin/tests/system/masterformat/clean.sh
+++ b/bin/tests/system/masterformat/clean.sh
@@ -34,5 +34,4 @@ rm -f ./ns3/example.db.raw ./ns3/dynamic.db.raw
 rm -f ./baseline.txt ./text.* ./raw.*
 rm -f ./ns1/Ksigned.* ./ns1/dsset-signed. ./ns1/signed.db.signed
 rm -f ./rndc.out
-rm -f ./ns*/named.lock
 rm -f ./ns*/managed-keys.bind*
diff --git a/bin/tests/system/metadata/clean.sh b/bin/tests/system/metadata/clean.sh
index bac7f18c37..f70aa0856e 100644
--- a/bin/tests/system/metadata/clean.sh
+++ b/bin/tests/system/metadata/clean.sh
@@ -18,4 +18,3 @@ rm -f prerev.key postrev.key oldstyle.key
 rm -f keys sigs
 rm -f tmp.out
 rm -f settime1.test* settime2.test*
-rm -f ns*/named.lock
diff --git a/bin/tests/system/mirror/ns3/named.args b/bin/tests/system/mirror/ns3/named.args
index 78f3feba8f..e28cf3a076 100644
--- a/bin/tests/system/mirror/ns3/named.args
+++ b/bin/tests/system/mirror/ns3/named.args
@@ -1 +1 @@
--D mirror-ns3 -X named.lock -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T tat=3
+-D mirror-ns3 -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T tat=3
diff --git a/bin/tests/system/mkeys/clean.sh b/bin/tests/system/mkeys/clean.sh
index 045c9b21c5..efaefb14ff 100644
--- a/bin/tests/system/mkeys/clean.sh
+++ b/bin/tests/system/mkeys/clean.sh
@@ -21,7 +21,6 @@ rm -f */named.memstats */named.run */named.run.prev
 rm -f dig.out* delv.out* rndc.out* signer.out*
 rm -f dsset-. ns1/dsset-.
 rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock
 rm -f ns1/dsset-sub.tld.
 rm -f ns1/dsset-tld.
 rm -f ns1/named.secroots ns1/root.db.signed* ns1/root.db.tmp
diff --git a/bin/tests/system/mkeys/ns2/named.args b/bin/tests/system/mkeys/ns2/named.args
index e588c91b48..175e02c098 100644
--- a/bin/tests/system/mkeys/ns2/named.args
+++ b/bin/tests/system/mkeys/ns2/named.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -D mkeys-ns2 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=5/10/20 -T tat=1
+-m record -c named.conf -d 99 -D mkeys-ns2 -g -T maxcachesize=2097152 -T mkeytimers=5/10/20 -T tat=1
diff --git a/bin/tests/system/mkeys/ns3/named.args b/bin/tests/system/mkeys/ns3/named.args
index 28396c356c..342cbe328b 100644
--- a/bin/tests/system/mkeys/ns3/named.args
+++ b/bin/tests/system/mkeys/ns3/named.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -D mkeys-ns3 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=5/10/20
+-m record -c named.conf -d 99 -D mkeys-ns3 -g -T maxcachesize=2097152 -T mkeytimers=5/10/20
diff --git a/bin/tests/system/mkeys/ns5/named1.args b/bin/tests/system/mkeys/ns5/named1.args
index 6eeaa29006..cd9a2283ed 100644
--- a/bin/tests/system/mkeys/ns5/named1.args
+++ b/bin/tests/system/mkeys/ns5/named1.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -X named.lock -g -T maxcachesize=2097152
+-m record -c named.conf -d 99 -g -T maxcachesize=2097152
diff --git a/bin/tests/system/mkeys/ns5/named2.args b/bin/tests/system/mkeys/ns5/named2.args
index 34ac30d937..a251448087 100644
--- a/bin/tests/system/mkeys/ns5/named2.args
+++ b/bin/tests/system/mkeys/ns5/named2.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=2/20/40
+-m record -c named.conf -d 99 -g -T maxcachesize=2097152 -T mkeytimers=2/20/40
diff --git a/bin/tests/system/mkeys/ns6/named.args b/bin/tests/system/mkeys/ns6/named.args
index 7ef5cf02f9..bfab8cb4fc 100644
--- a/bin/tests/system/mkeys/ns6/named.args
+++ b/bin/tests/system/mkeys/ns6/named.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=5/10/20
+-m record -c named.conf -d 99 -g -T maxcachesize=2097152 -T mkeytimers=5/10/20
diff --git a/bin/tests/system/names/clean.sh b/bin/tests/system/names/clean.sh
index 1f8371bfcc..8864732ef5 100644
--- a/bin/tests/system/names/clean.sh
+++ b/bin/tests/system/names/clean.sh
@@ -12,7 +12,6 @@
 # information regarding copyright ownership.
 
 rm -f dig.*.test*
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.pid
diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh
index bf543259bb..fe2156be93 100644
--- a/bin/tests/system/notify/clean.sh
+++ b/bin/tests/system/notify/clean.sh
@@ -26,7 +26,6 @@ rm -f dig.out.ns3.test*
 rm -f dig.out.ns4.test*
 rm -f log.out
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
-rm -f ns*/named.lock
 rm -f ns2/example.db
 rm -f ns2/x21.db*
 rm -f ns3/example.bk
diff --git a/bin/tests/system/nslookup/clean.sh b/bin/tests/system/nslookup/clean.sh
index dc0c70d64e..1cace4d6b1 100644
--- a/bin/tests/system/nslookup/clean.sh
+++ b/bin/tests/system/nslookup/clean.sh
@@ -14,7 +14,6 @@
 rm -f ns1/example.db
 rm -f nslookup.out*
 rm -f nslookup.err*
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.conf
diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh
index c77d627f0c..99f3d4d612 100644
--- a/bin/tests/system/nsupdate/clean.sh
+++ b/bin/tests/system/nsupdate/clean.sh
@@ -27,7 +27,6 @@ rm -f jp.out.ns3.*
 rm -f keygen.out.*
 rm -f nextpart.out.*
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
-rm -f ns*/named.lock
 rm -f ns1/example.db ns1/unixtime.db ns1/yyyymmddvv.db ns1/update.db ns1/other.db ns1/keytests.db
 rm -f ns1/many.test.db
 rm -f ns1/maxjournal.db
diff --git a/bin/tests/system/nsupdate/ns5/named.args b/bin/tests/system/nsupdate/ns5/named.args
index fc5a5cd2a7..a50eb55613 100644
--- a/bin/tests/system/nsupdate/ns5/named.args
+++ b/bin/tests/system/nsupdate/ns5/named.args
@@ -1 +1 @@
--D nsupdate-ns5 -m record -c named.conf -d 99 -X named.lock -g -U 4 -T maxcachesize=2097152 -T fixedlocal
+-D nsupdate-ns5 -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T fixedlocal
diff --git a/bin/tests/system/nsupdate/ns6/named.args b/bin/tests/system/nsupdate/ns6/named.args
index 48e2bd82c6..e7d800f5ae 100644
--- a/bin/tests/system/nsupdate/ns6/named.args
+++ b/bin/tests/system/nsupdate/ns6/named.args
@@ -1 +1 @@
--D nsupdate-ns6 -m record -c named.conf -d 99 -X named.lock -g -U 4 -T maxcachesize=2097152 -T fixedlocal
+-D nsupdate-ns6 -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T fixedlocal
diff --git a/bin/tests/system/padding/clean.sh b/bin/tests/system/padding/clean.sh
index eef21748c3..190863ae99 100644
--- a/bin/tests/system/padding/clean.sh
+++ b/bin/tests/system/padding/clean.sh
@@ -16,6 +16,5 @@ rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.stats
 rm -f ns*/named.stats.prev
-rm -f ns*/named.lock
 rm -f ns*/named.conf
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/pending/clean.sh b/bin/tests/system/pending/clean.sh
index 89a4b5bb86..a75013fc88 100644
--- a/bin/tests/system/pending/clean.sh
+++ b/bin/tests/system/pending/clean.sh
@@ -22,6 +22,5 @@ rm -rf ns1/root.db
 rm -rf ns2/example.db
 rm -rf ns2/example.com.db
 rm -rf nsupdate.out.test
-rm -f ns*/named.lock
 rm -f ns*/named.conf
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/pipelined/clean.sh b/bin/tests/system/pipelined/clean.sh
index 7ec0aad06b..31983f58c9 100644
--- a/bin/tests/system/pipelined/clean.sh
+++ b/bin/tests/system/pipelined/clean.sh
@@ -15,5 +15,4 @@ rm -f ./*/named.conf
 rm -f ./*/named.memstats
 rm -f ./*/named.run*
 rm -f raw* output* ./*.out.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/qmin/clean.sh b/bin/tests/system/qmin/clean.sh
index 52c38e68ba..f5b2546fcf 100644
--- a/bin/tests/system/qmin/clean.sh
+++ b/bin/tests/system/qmin/clean.sh
@@ -15,6 +15,5 @@ rm -f ns*/named.conf
 rm -f */named.memstats
 rm -f */named.run */named.run.prev
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ans*/query.log*
 rm -f query*.log
diff --git a/bin/tests/system/reclimit/clean.sh b/bin/tests/system/reclimit/clean.sh
index 0a92f90c3e..693f1c832f 100644
--- a/bin/tests/system/reclimit/clean.sh
+++ b/bin/tests/system/reclimit/clean.sh
@@ -18,5 +18,4 @@ rm -f ans4/ans.limit
 rm -f ns?/named.memstats
 rm -f ns?/named.run
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/redirect/clean.sh b/bin/tests/system/redirect/clean.sh
index 9489c94fb7..d8c120705a 100644
--- a/bin/tests/system/redirect/clean.sh
+++ b/bin/tests/system/redirect/clean.sh
@@ -16,7 +16,6 @@ rm -f */named.memstats
 rm -f */named.run
 rm -f */named.stats
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns1/K*
 rm -f ns1/dsset-nsec3.
 rm -f ns1/dsset-signed.
diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh
index d4ff98373f..1d9865138f 100644
--- a/bin/tests/system/resolver/clean.sh
+++ b/bin/tests/system/resolver/clean.sh
@@ -35,6 +35,5 @@ rm -f ns6/to-be-removed.tld.db ns6/to-be-removed.tld.db.jnl
 rm -f ns7/server.db ns7/server.db.jnl
 rm -f resolve.out.*.test*
 rm -f .digrc
-rm -f ns*/named.lock
 rm -f ns5/trusted.conf
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
diff --git a/bin/tests/system/resolver/ns9/named.args b/bin/tests/system/resolver/ns9/named.args
index 0c66bc0608..45022e26ea 100644
--- a/bin/tests/system/resolver/ns9/named.args
+++ b/bin/tests/system/resolver/ns9/named.args
@@ -1,2 +1,2 @@
 # this server is IPv6 only
--6 -m record -c named.conf -d 99 -D resolver-ns9 -X named.lock -g -T maxcachesize=2097152
+-6 -m record -c named.conf -d 99 -D resolver-ns9 -g -T maxcachesize=2097152
diff --git a/bin/tests/system/rndc/clean.sh b/bin/tests/system/rndc/clean.sh
index 7d08f5badc..6b4f2fd894 100644
--- a/bin/tests/system/rndc/clean.sh
+++ b/bin/tests/system/rndc/clean.sh
@@ -15,7 +15,6 @@ rm -f dig.out.*.test*
 rm -f ns*/*.nta
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run ns*/named.run.prev
 rm -f ns2/named.stats
diff --git a/bin/tests/system/rndc/ns6/named.args b/bin/tests/system/rndc/ns6/named.args
index 331f7f4125..94bde0d35c 100644
--- a/bin/tests/system/rndc/ns6/named.args
+++ b/bin/tests/system/rndc/ns6/named.args
@@ -1,3 +1,3 @@
 # teardown of a huge zone with tracing enabled takes way too long
 # -m none is set so that stop.pl does not timeout
--D rndc-ns6 -X named.lock -m none -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152
+-D rndc-ns6 -m none -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152
diff --git a/bin/tests/system/rpz/clean.sh b/bin/tests/system/rpz/clean.sh
index 5a457c13b6..2515183499 100644
--- a/bin/tests/system/rpz/clean.sh
+++ b/bin/tests/system/rpz/clean.sh
@@ -50,7 +50,6 @@ if [ ${PARTIAL:-unset} = unset ]; then
   rm -f ns5/requests ns5/*.perf
   rm -f */named.memstats */*.run */*.run.prev */named.stats */session.key
   rm -f */*.log */*core */*.pid
-  rm -f ns*/named.lock
   rm -f ns*/named.conf
   rm -f ns*/*switch
   rm -f dnsrps.zones
diff --git a/bin/tests/system/rpz/ns5/named.args b/bin/tests/system/rpz/ns5/named.args
index 56edbe343b..a872a98d5f 100644
--- a/bin/tests/system/rpz/ns5/named.args
+++ b/bin/tests/system/rpz/ns5/named.args
@@ -1,2 +1,2 @@
 # run the performance test close to real life
--c named.conf -D rpz-ns5 -X named.lock -gd3 -T maxcachesize=2097152
+-c named.conf -D rpz-ns5 -gd3 -T maxcachesize=2097152
diff --git a/bin/tests/system/rpzextra/clean.sh b/bin/tests/system/rpzextra/clean.sh
index 928ee8ba87..50fe41b3b9 100644
--- a/bin/tests/system/rpzextra/clean.sh
+++ b/bin/tests/system/rpzextra/clean.sh
@@ -13,7 +13,6 @@
 
 rm -f ns*/*.jnl
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/rpz*.txt
diff --git a/bin/tests/system/rpzextra/ns3/named.args b/bin/tests/system/rpzextra/ns3/named.args
index 970fc22639..227438d376 100644
--- a/bin/tests/system/rpzextra/ns3/named.args
+++ b/bin/tests/system/rpzextra/ns3/named.args
@@ -1 +1 @@
- -m record -c named.conf -d 99 -D rpzextra-ns1 -X named.lock -U 4 -T maxcachesize=2097152
+ -m record -c named.conf -d 99 -D rpzextra-ns1 -U 4 -T maxcachesize=2097152
diff --git a/bin/tests/system/rpzrecurse/clean.sh b/bin/tests/system/rpzrecurse/clean.sh
index d1d57abb6b..fd383b0f44 100644
--- a/bin/tests/system/rpzrecurse/clean.sh
+++ b/bin/tests/system/rpzrecurse/clean.sh
@@ -15,7 +15,6 @@
 
 rm -f dig.out.*
 
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/*.run
 rm -f ns*/*core *core
diff --git a/bin/tests/system/rrchecker/clean.sh b/bin/tests/system/rrchecker/clean.sh
index 166247d40c..5987b15cc5 100644
--- a/bin/tests/system/rrchecker/clean.sh
+++ b/bin/tests/system/rrchecker/clean.sh
@@ -12,4 +12,3 @@
 # information regarding copyright ownership.
 
 rm -f classlist.out privatelist.out typelist.out tempzone checkzone.out* checker.out
-rm -f ns*/named.lock
diff --git a/bin/tests/system/rrl/clean.sh b/bin/tests/system/rrl/clean.sh
index 687a0a0041..11b8760307 100644
--- a/bin/tests/system/rrl/clean.sh
+++ b/bin/tests/system/rrl/clean.sh
@@ -19,5 +19,4 @@ rm -f broken.out
 rm -f dig.out* *mdig.out*
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns3/bl*.db */*.jnl */*.core */*.pid
diff --git a/bin/tests/system/rrsetorder/clean.sh b/bin/tests/system/rrsetorder/clean.sh
index c64ae34bb0..ce58c840fb 100644
--- a/bin/tests/system/rrsetorder/clean.sh
+++ b/bin/tests/system/rrsetorder/clean.sh
@@ -18,6 +18,5 @@ rm -f dig.out.cyclic2
 rm -f ns2/root.bk
 rm -f ns?/named.run ns?/named.core
 rm -f */named.memstats
-rm -f ns*/named.lock
 rm -f ns*/named.conf
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/rsabigexponent/clean.sh b/bin/tests/system/rsabigexponent/clean.sh
index 22ea41ad2a..c2554f2498 100644
--- a/bin/tests/system/rsabigexponent/clean.sh
+++ b/bin/tests/system/rsabigexponent/clean.sh
@@ -18,6 +18,5 @@ rm -f ns*/named.memstats
 rm -f ns1/root.db
 rm -f ns2/signer.err
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns*/named.conf
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/runtime/clean.sh b/bin/tests/system/runtime/clean.sh
index 39fdc0cbd0..e61a7af368 100644
--- a/bin/tests/system/runtime/clean.sh
+++ b/bin/tests/system/runtime/clean.sh
@@ -18,7 +18,7 @@ rm -f */named*.run
 rm -f */named.memstats
 rm -f kill*.out
 rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock ns*/named*.pid ns*/other.lock
+rm -f ns*/named*.pid
 rm -f ns2/named.conf ns2/named-alt*.conf
 rm -f rndc.out*
 rm -rf ns2/nope
diff --git a/bin/tests/system/runtime/ns2/named-alt3.conf.in b/bin/tests/system/runtime/ns2/named-alt3.conf.in
deleted file mode 100644
index 0f351aa9c6..0000000000
--- a/bin/tests/system/runtime/ns2/named-alt3.conf.in
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-// NS2
-
-options {
-	query-source address 10.53.0.2;
-	port @PORT@;
-	pid-file "named-alt3.pid";
-	lock-file none;
-	listen-on { 10.53.0.2; 10.53.0.3; };
-	listen-on-v6 { fd92:7065:b8e:ffff::2; };
-	recursion no;
-	notify yes;
-	dnssec-validation no;
-};
diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh
index cb61c9aa7a..dec61dc546 100644
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -77,32 +77,6 @@ grep "another named process" ns2/named.run >/dev/null && ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
-n=$((n + 1))
-echo_i "verifying that named checks for conflicting named processes ($n)"
-ret=0
-test -f ns2/named.lock || ret=1
-testpid=$(run_named ns2 named$n.run -c named-alt2.conf -D runtime-ns2-extra-2 -X named.lock)
-test -n "$testpid" || ret=1
-retry_quiet 10 check_named_log "another named process" ns2/named$n.run || ret=1
-test -n "$testpid" && retry_quiet 10 check_pid $testpid || ret=1
-test -n "$testpid" && kill -15 $testpid >kill$n.out 2>&1 && ret=1
-test -n "$testpid" && retry_quiet 10 check_pid $testpid || ret=1
-test -f ns2/named.lock || ret=1
-if [ $ret -ne 0 ]; then echo_i "failed"; fi
-status=$((status + ret))
-
-n=$((n + 1))
-echo_i "verifying that 'lock-file none' disables process check ($n)"
-ret=0
-testpid=$(run_named ns2 named$n.run -c named-alt3.conf -D runtime-ns2-extra-3)
-test -n "$testpid" || ret=1
-retry_quiet 60 check_named_log "running$" ns2/named$n.run || ret=1
-grep "another named process" ns2/named$n.run >/dev/null && ret=1
-kill_named ns2/named-alt3.pid || ret=1
-test -n "$testpid" && retry_quiet 10 check_pid $testpid || ret=1
-if [ $ret -ne 0 ]; then echo_i "failed"; fi
-status=$((status + ret))
-
 n=$((n + 1))
 echo_i "checking that named refuses to reconfigure if working directory is not writable ($n)"
 ret=0
diff --git a/bin/tests/system/sfcache/clean.sh b/bin/tests/system/sfcache/clean.sh
index e8bd8189fd..2d380fcdb6 100644
--- a/bin/tests/system/sfcache/clean.sh
+++ b/bin/tests/system/sfcache/clean.sh
@@ -22,6 +22,5 @@ rm -f ./dig.*
 rm -f ./rndc.*
 rm -f ./sfcache.*
 rm -f ./ns*/managed-keys.bind*
-rm -f ./ns*/named.lock
 rm -f ./ns5/named.run.part*
 rm -f ./ns5/named_dump*
diff --git a/bin/tests/system/shutdown/clean.sh b/bin/tests/system/shutdown/clean.sh
index d958521541..0f949a42bd 100644
--- a/bin/tests/system/shutdown/clean.sh
+++ b/bin/tests/system/shutdown/clean.sh
@@ -12,7 +12,6 @@
 # information regarding copyright ownership.
 
 rm -f ns*/*.jnl
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/rpz*.txt
 rm -f */named.conf
diff --git a/bin/tests/system/smartsign/clean.sh b/bin/tests/system/smartsign/clean.sh
index ad975afae1..7acfdfa349 100644
--- a/bin/tests/system/smartsign/clean.sh
+++ b/bin/tests/system/smartsign/clean.sh
@@ -12,4 +12,3 @@
 # information regarding copyright ownership.
 
 rm -f K* dsset-* *.signed dnskey.sigs other.sigs dsset.out
-rm -f ns*/named.lock
diff --git a/bin/tests/system/sortlist/clean.sh b/bin/tests/system/sortlist/clean.sh
index b490f46907..3ca616cecc 100644
--- a/bin/tests/system/sortlist/clean.sh
+++ b/bin/tests/system/sortlist/clean.sh
@@ -15,5 +15,4 @@ rm -f *.dig *.good *.out
 rm -f */named.memstats
 rm -f */named.run
 rm -f */named.conf
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/spf/clean.sh b/bin/tests/system/spf/clean.sh
index 90dc7b61a9..c0ca9ebc77 100644
--- a/bin/tests/system/spf/clean.sh
+++ b/bin/tests/system/spf/clean.sh
@@ -13,6 +13,5 @@
 
 rm -f ns1/named.run
 rm -f ns1/named.memstats
-rm -f ns*/named.lock
 rm -f ns*/named.conf
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index 2a2d7809f7..66bb59afda 100755
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -269,7 +269,6 @@ sub construct_ns_command {
 		}
 	} else {
 		$command .= "-D $test-$server ";
-		$command .= "-X named.lock ";
 		$command .= "-m record ";
 
 		foreach my $t_option(
diff --git a/bin/tests/system/staticstub/clean.sh b/bin/tests/system/staticstub/clean.sh
index f0dbe280dd..50202e293a 100755
--- a/bin/tests/system/staticstub/clean.sh
+++ b/bin/tests/system/staticstub/clean.sh
@@ -13,7 +13,6 @@
 
 rm -f tmp
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns*/named.conf
 rm -f ns3/example.db
 rm -f ns3/undelegated.db
diff --git a/bin/tests/system/statistics/clean.sh b/bin/tests/system/statistics/clean.sh
index 37fa7dc9af..a1fc8d0288 100644
--- a/bin/tests/system/statistics/clean.sh
+++ b/bin/tests/system/statistics/clean.sh
@@ -25,7 +25,6 @@ rm -f */named.stats
 rm -f */named.stats-stage*
 rm -f dig.out*
 rm -f curl.out.*
-rm -f ns*/named.lock
 rm -f stats*out
 rm -f ns*/managed-keys.bind*
 rm -f xsltproc.out.*
diff --git a/bin/tests/system/statschannel/clean.sh b/bin/tests/system/statschannel/clean.sh
index 1ff2586850..d1ce8d27d2 100644
--- a/bin/tests/system/statschannel/clean.sh
+++ b/bin/tests/system/statschannel/clean.sh
@@ -18,7 +18,6 @@ rm -f dig.out*
 rm -f nc.out* curl.out* header.in*
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run*
 rm -f ns*/named.stats
diff --git a/bin/tests/system/statschannel/tests.sh b/bin/tests/system/statschannel/tests.sh
index bce8be0025..fd0813b23d 100644
--- a/bin/tests/system/statschannel/tests.sh
+++ b/bin/tests/system/statschannel/tests.sh
@@ -18,7 +18,7 @@ set -e
 
 DIGCMD="$DIG @10.53.0.2 -p ${PORT}"
 RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
-NS_PARAMS="-X named.lock -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152"
+NS_PARAMS="-m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152"
 
 if ! $FEATURETEST --have-json-c; then
   unset PERL_JSON
diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index bcbf04f5b2..93474b0ee0 100644
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -130,16 +130,6 @@ exit($errors);
 
 # Subroutines
 
-# Return the full path to a given server's lock file.
-sub server_lock_file {
-	my ( $server ) = @_;
-
-	return $testdir . "/" . $server . "/named.lock" if ($server =~ /^ns/);
-	return if ($server =~ /^ans/);
-
-	die "Unknown server type $server\n";
-}
-
 # Return the full path to a given server's PID file.
 sub server_pid_file {
 	my ( $server ) = @_;
@@ -257,15 +247,6 @@ sub pid_file_exists {
 	return $server;
 }
 
-sub lock_file_exists {
-	my ( $server ) = @_;
-	my $lock_file = server_lock_file($server);
-
-	return unless defined($lock_file) && -f $lock_file;
-
-	return $server;
-}
-
 sub wait_for_servers {
 	my ( $timeout, @servers ) = @_;
 
@@ -273,7 +254,7 @@ sub wait_for_servers {
 		sleep 1 if (@servers > 0);
 		@servers =
 			grep { defined($_) }
-			map  { pid_file_exists($_) || lock_file_exists($_) } @servers;
+			map  { pid_file_exists($_) } @servers;
 		$timeout--;
 	}
 
diff --git a/bin/tests/system/stress/clean.sh b/bin/tests/system/stress/clean.sh
index 4833fa7df8..cf460f867f 100644
--- a/bin/tests/system/stress/clean.sh
+++ b/bin/tests/system/stress/clean.sh
@@ -16,7 +16,6 @@ rm -f ns?/zone*.bk
 rm -f ns2/zone0*.db
 rm -f ns2/zone0*.jnl
 rm -f */named.memstats
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.run
 rm -f ns*/named.conf
diff --git a/bin/tests/system/stub/clean.sh b/bin/tests/system/stub/clean.sh
index 504df030fb..11984101af 100644
--- a/bin/tests/system/stub/clean.sh
+++ b/bin/tests/system/stub/clean.sh
@@ -18,6 +18,5 @@ rm -f dig.out.ns[35] ns3/child.example.st
 rm -f */named.memstats
 rm -f */named.conf
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
 rm -f ns5/example.db
diff --git a/bin/tests/system/tcp/clean.sh b/bin/tests/system/tcp/clean.sh
index 1ea5b60d0f..4a25e92632 100644
--- a/bin/tests/system/tcp/clean.sh
+++ b/bin/tests/system/tcp/clean.sh
@@ -18,5 +18,4 @@ rm -f ./*/named.stats*
 rm -f ans6/ans.run*
 rm -f dig.out*
 rm -f rndc.out*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/timeouts/clean.sh b/bin/tests/system/timeouts/clean.sh
index 0da8a9c25f..01f3750d22 100644
--- a/bin/tests/system/timeouts/clean.sh
+++ b/bin/tests/system/timeouts/clean.sh
@@ -13,7 +13,6 @@
 
 rm -f ./ns*/managed-keys.bind*
 rm -f ./ns*/named.conf
-rm -f ./ns*/named.lock
 rm -f ./ns*/named.memstats
 rm -f ./ns*/named.run*
 rm -f ./ns*/named.stats
diff --git a/bin/tests/system/timeouts/ns1/named.args b/bin/tests/system/timeouts/ns1/named.args
index 437a77f0f4..370187442c 100644
--- a/bin/tests/system/timeouts/ns1/named.args
+++ b/bin/tests/system/timeouts/ns1/named.args
@@ -1 +1 @@
--m record -c named.conf -d 1 -D timeouts-ns1 -X named.lock -g -T maxcachesize=2097152
+-m record -c named.conf -d 1 -D timeouts-ns1 -g -T maxcachesize=2097152
diff --git a/bin/tests/system/tsig/clean.sh b/bin/tests/system/tsig/clean.sh
index 2f83915b4a..709333c4b4 100644
--- a/bin/tests/system/tsig/clean.sh
+++ b/bin/tests/system/tsig/clean.sh
@@ -20,7 +20,6 @@ rm -f */named.memstats
 rm -f */named.conf
 rm -f ns1/named-fips.conf
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f Kexample.net.*
 rm -f keygen.out?
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/tsiggss/clean.sh b/bin/tests/system/tsiggss/clean.sh
index 0ace209efb..3c4fcf28db 100644
--- a/bin/tests/system/tsiggss/clean.sh
+++ b/bin/tests/system/tsiggss/clean.sh
@@ -24,5 +24,4 @@ rm -f */named.run
 rm -f authsock.pid
 rm -f ns1/core
 rm -f nsupdate.out*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/unknown/clean.sh b/bin/tests/system/unknown/clean.sh
index 1d73edda5b..e444d044ff 100644
--- a/bin/tests/system/unknown/clean.sh
+++ b/bin/tests/system/unknown/clean.sh
@@ -18,5 +18,4 @@ rm -f */named.run
 rm -f */*.bk
 rm -f */*.bk.*
 rm -f ns3/Kexample.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
diff --git a/bin/tests/system/upforwd/clean.sh b/bin/tests/system/upforwd/clean.sh
index 2641c43893..14b9cc6a44 100644
--- a/bin/tests/system/upforwd/clean.sh
+++ b/bin/tests/system/upforwd/clean.sh
@@ -28,7 +28,6 @@ rm -f */named.conf
 rm -f */ans.run
 rm -f Ksig0.example2.*
 rm -f keyname keyname.err
-rm -f ns*/named.lock
 rm -f ns1/example2.db
 rm -f ns*/managed-keys.bind*
 rm -f nsupdate.out.*
diff --git a/bin/tests/system/verify/clean.sh b/bin/tests/system/verify/clean.sh
index ee2af33214..5e801a0215 100644
--- a/bin/tests/system/verify/clean.sh
+++ b/bin/tests/system/verify/clean.sh
@@ -11,7 +11,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-rm -f ns*/named.lock
 rm -f verify.out*
 rm -f zones/*.bad
 rm -f zones/*.good
diff --git a/bin/tests/system/views/clean.sh b/bin/tests/system/views/clean.sh
index d644c2a6af..3bb36296d2 100644
--- a/bin/tests/system/views/clean.sh
+++ b/bin/tests/system/views/clean.sh
@@ -34,5 +34,4 @@ rm -f ns2/internal/inline.db.signed.jnl
 rm -f ns2/zones.conf
 rm -f ns2/db.* ns2/K*
 rm -f dig.out.external dig.out.internal
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
diff --git a/bin/tests/system/wildcard/clean.sh b/bin/tests/system/wildcard/clean.sh
index c690adeedd..11af62d8ec 100644
--- a/bin/tests/system/wildcard/clean.sh
+++ b/bin/tests/system/wildcard/clean.sh
@@ -24,5 +24,4 @@ rm -f ns1/private.nsec3.conf
 rm -f ns1/signer.err
 rm -f */named.memstats
 rm -f dig.out.ns*.test*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh
index effdda8a92..3cbcba5071 100644
--- a/bin/tests/system/xfer/clean.sh
+++ b/bin/tests/system/xfer/clean.sh
@@ -23,7 +23,6 @@ rm -f */named.run.prev
 rm -f axfr.out
 rm -f dig.out.*
 rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock
 rm -f ns1/dot-fallback.db
 rm -f ns1/edns-expire.db
 rm -f ns1/ixfr-too-big.db ns1/ixfr-too-big.db.jnl
diff --git a/bin/tests/system/xfer/ns6/named.args b/bin/tests/system/xfer/ns6/named.args
index 2be062bbdd..7580d15297 100644
--- a/bin/tests/system/xfer/ns6/named.args
+++ b/bin/tests/system/xfer/ns6/named.args
@@ -1 +1 @@
--D xfer-ns6 -X named.lock -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T transferinsecs
+-D xfer-ns6 -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T transferinsecs
diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 7b470afff5..01427a2a4d 100755
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -17,7 +17,7 @@ set -e
 
 DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}"
 RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
-NS_PARAMS="-X named.lock -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152"
+NS_PARAMS="-m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152"
 
 status=0
 n=0
diff --git a/bin/tests/system/xferquota/clean.sh b/bin/tests/system/xferquota/clean.sh
index 9cc405735c..d3f3cf8a74 100644
--- a/bin/tests/system/xferquota/clean.sh
+++ b/bin/tests/system/xferquota/clean.sh
@@ -22,5 +22,4 @@ rm -f ns1/changing.db
 rm -f */named.memstats
 rm -f */named.conf
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/zero/clean.sh b/bin/tests/system/zero/clean.sh
index 2ef5727abf..ab392ef545 100644
--- a/bin/tests/system/zero/clean.sh
+++ b/bin/tests/system/zero/clean.sh
@@ -18,5 +18,4 @@ rm -f ns2/example.db
 rm -f ns4/example.bk
 rm -f dig.out*
 rm -f query.list
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/zero/ns2/named.args b/bin/tests/system/zero/ns2/named.args
index 4b7aad606a..439aa06aea 100644
--- a/bin/tests/system/zero/ns2/named.args
+++ b/bin/tests/system/zero/ns2/named.args
@@ -1 +1 @@
--m record -c named.conf -d 1 -D zero-ns2 -X named.lock -g -T maxcachesize=2097152
+-m record -c named.conf -d 1 -D zero-ns2 -g -T maxcachesize=2097152
diff --git a/bin/tests/system/zero/ns3/named.args b/bin/tests/system/zero/ns3/named.args
index e6f6060089..84208ef2c7 100644
--- a/bin/tests/system/zero/ns3/named.args
+++ b/bin/tests/system/zero/ns3/named.args
@@ -1 +1 @@
--m record -c named.conf -d 1 -D zero-ns3 -X named.lock -g -T maxcachesize=2097152
+-m record -c named.conf -d 1 -D zero-ns3 -g -T maxcachesize=2097152
diff --git a/bin/tests/system/zero/ns4/named.args b/bin/tests/system/zero/ns4/named.args
index bd59f13b6c..3727170f5c 100644
--- a/bin/tests/system/zero/ns4/named.args
+++ b/bin/tests/system/zero/ns4/named.args
@@ -1 +1 @@
--m record -c named.conf -d 1 -D zero-ns4 -X named.lock -g -T maxcachesize=2097152
+-m record -c named.conf -d 1 -D zero-ns4 -g -T maxcachesize=2097152
diff --git a/bin/tests/system/zonechecks/clean.sh b/bin/tests/system/zonechecks/clean.sh
index 330b242b04..07a59397cd 100644
--- a/bin/tests/system/zonechecks/clean.sh
+++ b/bin/tests/system/zonechecks/clean.sh
@@ -18,5 +18,4 @@ rm -f */named.run
 rm -f */*.db */*.db.signed */K*.key */K*.private */K*.state */*.jnl */dsset-*
 rm -f */signer.err
 rm -f rndc.out.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 0ca6ac1164..6a41db4194 100644
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -1476,21 +1476,11 @@ default is used.
    This is the pathname of the file the server writes memory usage statistics to
    on exit. If not specified, the default is ``named.memstats``.
 
-.. namedconf:statement:: lock-file
-   :tags: server
+.. lock-file:
+   :tags: obsolete
    :short: Sets the pathname of the file on which :iscman:`named` attempts to acquire a file lock when starting for the first time.
 
-   This is the pathname of a file on which :iscman:`named` attempts to acquire a
-   file lock when starting for the first time; if unsuccessful, the
-   server terminates, under the assumption that another server
-   is already running. If not specified, the default is
-   ``none``.
-
-   Specifying ``lock-file none`` disables the use of a lock file.
-   :any:`lock-file` is ignored if :iscman:`named` was run using the :option:`-X <named -X>`
-   option, which overrides it. Changes to :any:`lock-file` are ignored if
-   :iscman:`named` is being reloaded or reconfigured; it is only effective
-   when the server is first started.
+   This option has been removed and using it will cause a fatal error.
 
 .. namedconf:statement:: pid-file
    :tags: server
diff --git a/doc/misc/options b/doc/misc/options
index 18a51d8609..9f78725f95 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -164,7 +164,6 @@ options {
 	listen-on [ port <integer> ] [ tls <string> ] [ http <string> ] { <address_match_element>; ... }; // may occur multiple times
 	listen-on-v6 [ port <integer> ] [ tls <string> ] [ http <string> ] { <address_match_element>; ... }; // may occur multiple times
 	lmdb-mapsize <sizeval>;
-	lock-file ( <quoted_string> | none );
 	managed-keys-directory <quoted_string>;
 	masterfile-format ( raw | text );
 	masterfile-style ( full | relative );
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 5fd0f69c05..d3acabc1b4 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -43,6 +43,15 @@ Removed Features
   The support for control channel over Unix Domain Sockets has been
   non-functional since BIND 9.18
 
+- Support for specifying ``lock-file`` via configuration and via the
+  :option:`named -X` command line option has been removed. An external process
+  supervisor should be used instead.  :gl:`#4391`
+
+  Alternatively :program:`flock` can be used to achieve the same effect as the
+  removed configuration/argument:
+
+    flock -n -x <dir>/named.lock <path>/named <args>
+
 Feature Changes
 ~~~~~~~~~~~~~~~
 
@@ -61,13 +70,6 @@ Bug Fixes
   DNSSEC records, it was scheduled to be resigning. This unwanted behavior
   has been fixed. :gl:`#4350`
 
-- The :any:`lock-file` file was being removed when it shouldn't
-  have been making it ineffective if named was started 3 or more
-  times. :gl:`#4387`
-
-- When :any:`lock-file` was used at the same time as :option:`named -X`, the
-  assertion failure would be triggered.  This has been fixed. :gl:`#4386`
-
 Known Issues
 ~~~~~~~~~~~~
 
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 348be0f592..226df1ed69 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1269,7 +1269,7 @@ static cfg_clausedef_t options_clauses[] = {
 	  CFG_CLAUSEFLAG_OBSOLETE },
 	{ "listen-on", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI },
 	{ "listen-on-v6", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI },
-	{ "lock-file", &cfg_type_qstringornone, 0 },
+	{ "lock-file", &cfg_type_qstringornone, CFG_CLAUSEFLAG_ANCIENT },
 	{ "managed-keys-directory", &cfg_type_qstring, 0 },
 	{ "match-mapped-addresses", &cfg_type_boolean, 0 },
 	{ "max-rsa-exponent-size", &cfg_type_uint32, 0 },
diff --git a/util/pairwise-testing.sh b/util/pairwise-testing.sh
index c60b659814..960695ad68 100755
--- a/util/pairwise-testing.sh
+++ b/util/pairwise-testing.sh
@@ -19,7 +19,6 @@ options {
 	port 5300;
 	listen-on { 127.0.0.1; };
 	listen-on-v6 { ::1; };
-	lock-file \"named.lock\";
 };
 
 zone \".\" {
@@ -74,13 +73,7 @@ while read -r -a configure_switches; do
     exit 1
   fi
   # "timeout" is unable to report a crash on shutdown via its exit
-  # code.  A named instance that exits cleanly is expected to
-  # clean up its configured lock file, so if it is still around at
-  # this point, something went wrong.
-  if [ -f "named.lock" ]; then
-    echo "named did not clean up its lock file, possible crash on shutdown"
-    exit 1
-  fi
+  # code.
   cd ..
   rm -rf "pairwise-${runid}" "pairwise-output.${runid}.txt"
 done <pairwise-commands.txt