diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 330842d2..def7d978 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -196,19 +196,23 @@ build_libretro_generic_makefile() {
 	fi
 }
 
-build_retroarch_generic_makefile() {
+build_libretro_test() {
 	build_dir="$WORKDIR/$1"
 
-	if build_should_skip $1 "$build_dir"; then
-		echo "Core $1 is already built, skipping..."
+	if build_should_skip "test" "$build_dir"; then
+		echo "Core test is already built, skipping..."
 		return
 	fi
 
 	if [ -d "$build_dir" ]; then
-		echo "=== Building $2 ==="
-		build_libretro_generic $1 "$2" "$3" $4 "$build_dir"
-		copy_core_to_dist $5
-		build_save_revision $? $1
+		echo "=== Building RetroArch test cores ==="
+		build_libretro_generic "retroarch" "libretro-test-gl" "Makefile" $FORMAT_COMPILER_TARGET "$build_dir"
+		copy_core_to_dist "testgl"
+		build_libretro_generic "retroarch" "libretro-test" "Makefile" $FORMAT_COMPILER_TARGET "$build_dir"
+		copy_core_to_dist "test"
+
+		# TODO: Check for more than test here...
+		build_save_revision $? "test"
 	else
 		echo "$1 not fetched, skipping ..."
 	fi
@@ -267,14 +271,6 @@ build_libretro_emux() {
 	build_save_revision $? "emux"
 }
 
-build_libretro_test() {
-	build_retroarch_generic_makefile "retroarch" "libretro-test" "Makefile" $FORMAT_COMPILER_TARGET "test"
-}
-
-build_libretro_testgl() {
-	build_retroarch_generic_makefile "retroarch" "libretro-test-gl" "Makefile" $FORMAT_COMPILER_TARGET "testgl"
-}
-
 build_libretro_picodrive() {
 	build_libretro_generic_makefile "picodrive" "." "Makefile.libretro" $FORMAT_COMPILER_TARGET
 }
diff --git a/libretro-build.sh b/libretro-build.sh
index 3501b966..67da549a 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -169,9 +169,6 @@ else
 	build_libretro_emux
 	build_libretro_fuse
 	build_libretro_test
-	if [ $FORMAT_COMPILER_TARGET != "ios" ]; then
-		build_libretro_testgl
-	fi
 fi
 build_summary
 
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 734f8afc..fd303474 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -30,7 +30,7 @@ libretro_snes9x_next_fetch_url="https://github.com/libretro/snes9x-next.git"
 libretro_snes9x_next_name="SNES9x Next"
 
 libretro_genesis_plus_gx_fetch_url="https://github.com/libretro/Genesis-Plus-GX.git"
-libretro_genesis_plus_gx="Genesis Plus GX"
+libretro_genesis_plus_gx_name="Genesis Plus GX"
 
 libretro_fb_alpha_fetch_url="https://github.com/libretro/fba-libretro.git"
 libretro_fb_alpha_name="Final Burn Alpha"
@@ -152,6 +152,7 @@ libretro_mupen64plus_fetch_url="https://github.com/libretro/mupen64plus-libretro
 libretro_mupen64plus_name="Mupen64Plus"
 
 libretro_dinothawr_fetch_url="https://github.com/libretro/Dinothawr.git"
+libretro_dinothawr_name="Dinothawr"
 
 libretro_uae_fetch_url="https://github.com/libretro/libretro-uae.git"
 libretro_uae_name="UAE"
@@ -254,7 +255,7 @@ fetch_retroarch() {
 	fetch_git "https://github.com/libretro/libretro-database.git" "retroarch/media/libretrodb" ""
 }
 
-fetch_tools() {
+fetch_devkit() {
 	fetch_git "https://github.com/libretro/libretro-manifest.git" "libretro-manifest" "libretro/libretro-manifest"
 	fetch_git "https://github.com/libretro/libretrodb.git" "libretrodb" "libretro/libretrodb"
 	fetch_git "https://github.com/libretro/libretro-dat-pull.git" "libretro-dat-pull" "libretro/libretro-dat-pull"
@@ -278,7 +279,7 @@ if [ -n "$1" ]; then
 	done
 else
 	fetch_retroarch
-	fetch_tools
+	fetch_devkit
 
 	libretro_fetch_core bsnes
 	libretro_fetch_core snes9x