diff --git a/.gitmodules b/.gitmodules
index a0abb555..0582d41d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "submodules/katex-fonts"]
 	path = submodules/katex-fonts
 	url = https://github.com/KaTeX/katex-fonts
+[submodule "submodules/katex-test-fonts"]
+	path = submodules/katex-test-fonts
+	url = https://github.com/KaTeX/katex-test-fonts.git
diff --git a/dockers/Screenshotter/screenshotter.sh b/dockers/Screenshotter/screenshotter.sh
index fc0f3f7f..b05a0494 100755
--- a/dockers/Screenshotter/screenshotter.sh
+++ b/dockers/Screenshotter/screenshotter.sh
@@ -14,18 +14,6 @@ cleanup() {
     container=
 }
 
-SS_DIR=$(dirname "$0")
-TOP_DIR=${SS_DIR}/../..
-FONTS_DIR=${TOP_DIR}/test/screenshotter/unicode-fonts
-if [[ ! -d "${FONTS_DIR}" ]]; then
-    echo "Cloning test fonts repository"
-    git clone https://github.com/Khan/KaTeX-test-fonts "${FONTS_DIR}" \
-        || exit 2
-fi
-pushd "${FONTS_DIR}" || exit 2
-git checkout --detach 99fa66a2da643218754c8236b9f9151cac71ba7c || exit 2
-popd || exit 2
-
 container=
 trap cleanup EXIT
 status=0
diff --git a/submodules/katex-test-fonts b/submodules/katex-test-fonts
new file mode 160000
index 00000000..371f4a79
--- /dev/null
+++ b/submodules/katex-test-fonts
@@ -0,0 +1 @@
+Subproject commit 371f4a7947293ada30ccacdbf403d713d128c944
diff --git a/test/screenshotter/test.html b/test/screenshotter/test.html
index 707d6240..671b01bd 100644
--- a/test/screenshotter/test.html
+++ b/test/screenshotter/test.html
@@ -12,11 +12,11 @@
       }
       @font-face {
         font-family: "Mincho";
-        src: url("unicode-fonts/mincho/font_1_honokamin.ttf") format("truetype");
+        src: url("/submodules/katex-test-fonts/mincho/font_1_honokamin.ttf") format("truetype");
       }
       @font-face {
         font-family: "Batang";
-        src: url("unicode-fonts/batang/batang.ttf") format("truetype");
+        src: url("/submodules/katex-test-fonts/batang/batang.ttf") format("truetype");
       }
       .katex .cjk_fallback {
           font-family: "Mincho",serif;