diff --git a/linuxgsm.sh b/linuxgsm.sh
index 6ffc9caa4..716d9e19f 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -274,15 +274,15 @@ if [ "$(whoami)" == "root" ]; then
 	fi
 fi
 
+# Download the latest serverlist. This is the complete list of all supported servers.
+fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
+if [ ! -f "${serverlist}" ]; then
+	echo "[ FAIL ] serverlist.csv could not be loaded."
+	exit 1
+fi
+
 # LinuxGSM installer mode.
 if [ "${shortname}" == "core" ]; then
-	# Download the latest serverlist. This is the complete list of all supported servers.
-	fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
-	if [ ! -f "${serverlist}" ]; then
-		echo "[ FAIL ] serverlist.csv could not be loaded."
-		exit 1
-	fi
-
 	if [ "${userinput}" == "list" ]||[ "${userinput}" == "l" ]; then
 		{
 			tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}' 
diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh
index ce7468b4c..82cdbbb90 100644
--- a/tests/tests_fctrserver.sh
+++ b/tests/tests_fctrserver.sh
@@ -268,15 +268,16 @@ if [ "$(whoami)" == "root" ]; then
 	fi
 fi
 
+# Download the latest serverlist. This is the complete list of all supported servers.
+fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
+if [ ! -f "${serverlist}" ]; then
+	echo "[ FAIL ] serverlist.csv could not be loaded."
+	exit 1
+fi
+
+
 # LinuxGSM installer mode.
 if [ "${shortname}" == "core" ]; then
-	# Download the latest serverlist. This is the complete list of all supported servers.
-	fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
-	if [ ! -f "${serverlist}" ]; then
-		echo "[ FAIL ] serverlist.csv could not be loaded."
-		exit 1
-	fi
-
 	if [ "${userinput}" == "list" ]||[ "${userinput}" == "l" ]; then
 		{
 			tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}' 
diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 2ae565ba0..c3df905bf 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -277,13 +277,6 @@ fi
 
 # LinuxGSM installer mode.
 if [ "${shortname}" == "core" ]; then
-	# Download the latest serverlist. This is the complete list of all supported servers.
-	fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
-	if [ ! -f "${serverlist}" ]; then
-		echo "[ FAIL ] serverlist.csv could not be loaded."
-		exit 1
-	fi
-
 	if [ "${userinput}" == "list" ]||[ "${userinput}" == "l" ]; then
 		{
 			tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}' 
diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index ee5268d47..22ae0f435 100644
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@@ -268,15 +268,15 @@ if [ "$(whoami)" == "root" ]; then
 	fi
 fi
 
+# Download the latest serverlist. This is the complete list of all supported servers.
+fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
+if [ ! -f "${serverlist}" ]; then
+	echo "[ FAIL ] serverlist.csv could not be loaded."
+	exit 1
+fi
+
 # LinuxGSM installer mode.
 if [ "${shortname}" == "core" ]; then
-	# Download the latest serverlist. This is the complete list of all supported servers.
-	fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
-	if [ ! -f "${serverlist}" ]; then
-		echo "[ FAIL ] serverlist.csv could not be loaded."
-		exit 1
-	fi
-
 	if [ "${userinput}" == "list" ]||[ "${userinput}" == "l" ]; then
 		{
 			tail -n +2 "${serverlist}" | awk -F "," '{print $2 "\t" $3}'