diff --git a/distrib/sets/lists/tests/mi b/distrib/sets/lists/tests/mi
index a2940da6e74f..a46322cb09e5 100644
--- a/distrib/sets/lists/tests/mi
+++ b/distrib/sets/lists/tests/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.850 2020/06/25 15:01:35 jruoho Exp $
+# $NetBSD: mi,v 1.851 2020/06/25 15:41:40 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3995,6 +3995,7 @@
 ./usr/tests/sbin/ifconfig/Kyuafile		tests-sbin-tests	compattestfile,atf,kyua
 ./usr/tests/sbin/ifconfig/t_nonexistent		tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/ifconfig/t_repeated_scan	tests-sbin-tests	compattestfile,atf
+./usr/tests/sbin/ifconfig/t_repeated_updown	tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/ifconfig/t_tap			tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/newfs				tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/newfs/Atffile			tests-sbin-tests	compattestfile,atf
diff --git a/tests/sbin/ifconfig/Makefile b/tests/sbin/ifconfig/Makefile
index 096f577d4280..8e7d4cad733c 100644
--- a/tests/sbin/ifconfig/Makefile
+++ b/tests/sbin/ifconfig/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2020/06/25 14:24:46 jruoho Exp $
+# $NetBSD: Makefile,v 1.4 2020/06/25 15:41:40 jruoho Exp $
 
 .include <bsd.own.mk>
 
 TESTSDIR=	${TESTSBASE}/sbin/ifconfig
 
-TESTS_SH=	t_nonexistent t_repeated_scan t_tap
+TESTS_SH=	t_nonexistent t_repeated_scan t_repeated_updown t_tap
 
 .include <bsd.test.mk>
diff --git a/tests/sbin/ifconfig/t_repeated_updown.sh b/tests/sbin/ifconfig/t_repeated_updown.sh
new file mode 100644
index 000000000000..1d3bc0aa60c0
--- /dev/null
+++ b/tests/sbin/ifconfig/t_repeated_updown.sh
@@ -0,0 +1,70 @@
+# $NetBSD: t_repeated_updown.sh,v 1.1 2020/06/25 15:41:40 jruoho Exp $
+#
+# Copyright (c) 2020 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+atf_test_case repeated_updown
+repeated_updown_head() {
+	atf_set "require.user" "root"
+	atf_set "descr" "Test with ifconfig(8) that repeated " \
+		"up/down does not cause a panic (PR kern/52771)"
+}
+
+repeated_updown_body() {
+
+	# Try to avoid stalling any automated test runs.
+	#
+	n=35
+
+	for i in $(ifconfig -l); do
+
+		state="up"
+		ifconfig -s $i
+
+		if [ $? -eq 1 ]; then
+			state="down"
+			ifconfig $i up
+			echo "Initialized $i up"
+		fi
+
+		while [ $n -gt 0 ]; do
+			ifconfig $i down
+			echo "Test $n: $i down"
+			ifconfig $i up
+			echo "Test $n: $i up"
+			n=$(expr $n - 1)
+		done
+
+		ifconfig $i $state
+		echo "Restored state of $i to $state"
+		sleep 1
+	done
+}
+
+atf_init_test_cases() {
+	atf_add_test_case repeated_updown
+}