diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c9e5706d90..da305acf3d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,6 +58,7 @@ jobs:
     strategy:
       matrix:
         maptype: ['/datum/map/cyberiad', '/datum/map/delta', '/datum/map/metastation']
+        byondtype: ['STABLE', 'BETA']
     services:
       mariadb:
         image: mariadb:latest
diff --git a/_build_dependencies.sh b/_build_dependencies.sh
index 1bf393667f7..b646f4700ca 100644
--- a/_build_dependencies.sh
+++ b/_build_dependencies.sh
@@ -3,9 +3,13 @@
 export SPACEMANDMM_TAG=suite-1.7.1
 # For TGUI
 export NODE_VERSION=12
-# Byond Major
-export BYOND_MAJOR=514
-# Byond Minor
-export BYOND_MINOR=1566
+# Stable Byond Major
+export STABLE_BYOND_MAJOR=514
+# Stable Byond Minor
+export STABLE_BYOND_MINOR=1589
+# Beta Byond Major
+export BETA_BYOND_MAJOR=515
+# Beta Byond Minor
+export BETA_BYOND_MINOR=1593
 # Python version for mapmerge and other tools
 export PYTHON_VERSION=3.7.9
diff --git a/tools/ci/install_byond.sh b/tools/ci/install_byond.sh
index 4e73dbb1289..2a1125112b1 100755
--- a/tools/ci/install_byond.sh
+++ b/tools/ci/install_byond.sh
@@ -1,9 +1,21 @@
 #!/bin/bash
-set -euo pipefail
+set -eo pipefail
 
 source _build_dependencies.sh
 
-if [ -d "$HOME/BYOND/byond/bin" ] && grep -Fxq "${BYOND_MAJOR}.${BYOND_MINOR}" $HOME/BYOND/version.txt;
+TARGET_MAJOR=$STABLE_BYOND_MAJOR
+TARGET_MINOR=$STABLE_BYOND_MINOR
+
+if [ -z "$1" ]; then
+	echo "No arg specified. Assuming STABLE."
+else
+	if [ "$1" == "BETA" ]; then
+		TARGET_MAJOR=$BETA_BYOND_MAJOR
+		TARGET_MINOR=$BETA_BYOND_MINOR
+	fi
+fi
+
+if [ -d "$HOME/BYOND/byond/bin" ] && grep -Fxq "${TARGET_MAJOR}.${TARGET_MINOR}" $HOME/BYOND/version.txt;
 then
   echo "Using cached directory."
 else
@@ -11,11 +23,11 @@ else
   rm -rf "$HOME/BYOND"
   mkdir -p "$HOME/BYOND"
   cd "$HOME/BYOND"
-  curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip
+  curl "http://www.byond.com/download/build/${TARGET_MAJOR}/${TARGET_MAJOR}.${TARGET_MINOR}_byond_linux.zip" -o byond.zip
   unzip byond.zip
   rm byond.zip
   cd byond
   make here
-  echo "$BYOND_MAJOR.$BYOND_MINOR" > "$HOME/BYOND/version.txt"
+  echo "$TARGET_MAJOR.$TARGET_MINOR" > "$HOME/BYOND/version.txt"
   cd ~/
 fi