diff --git a/Deprecation.md b/Deprecation.md
index 405a39e5b2..0d925cbc58 100644
--- a/Deprecation.md
+++ b/Deprecation.md
@@ -18,9 +18,11 @@ have any problems converting, please contact us via:
 | `BUILD_AUX_STATIC_LIBRARY`       | Warning   |
 | `BUILD_HOST_FUZZ_TEST`           | Warning   |
 | `BUILD_HOST_NATIVE_TEST`         | Warning   |
+| `BUILD_HOST_SHARED_TEST_LIBRARY` | Error     |
 | `BUILD_HOST_STATIC_TEST_LIBRARY` | Warning   |
 | `BUILD_HOST_TEST_CONFIG`         | Error     |
 | `BUILD_NATIVE_BENCHMARK`         | Warning   |
+| `BUILD_SHARED_TEST_LIBRARY`      | Error     |
 | `BUILD_STATIC_TEST_LIBRARY`      | Warning   |
 | `BUILD_TARGET_TEST_CONFIG`       | Error     |
 | `BUILD_*`                        | Available |
diff --git a/core/deprecation.mk b/core/deprecation.mk
index 0b668ac97a..11fe290bd5 100644
--- a/core/deprecation.mk
+++ b/core/deprecation.mk
@@ -10,7 +10,6 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \
   BUILD_HOST_JAVA_LIBRARY \
   BUILD_HOST_PREBUILT \
   BUILD_HOST_SHARED_LIBRARY \
-  BUILD_HOST_SHARED_TEST_LIBRARY \
   BUILD_HOST_STATIC_LIBRARY \
   BUILD_JAVA_LIBRARY \
   BUILD_MULTI_PREBUILT \
@@ -21,7 +20,6 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \
   BUILD_PREBUILT \
   BUILD_RRO_PACKAGE \
   BUILD_SHARED_LIBRARY \
-  BUILD_SHARED_TEST_LIBRARY \
   BUILD_STATIC_JAVA_LIBRARY \
   BUILD_STATIC_LIBRARY \
 
@@ -48,6 +46,8 @@ DEFAULT_ERROR_BUILD_MODULE_TYPES :=$= \
 # These are BUILD_* variables that are always errors to reference.
 # Setting the BUILD_BROKEN_USES_BUILD_* variables is also an error.
 OBSOLETE_BUILD_MODULE_TYPES :=$= \
+  BUILD_HOST_SHARED_TEST_LIBRARY \
+  BUILD_SHARED_TEST_LIBRARY \
 
 $(foreach m,$(OBSOLETE_BUILD_MODULE_TYPES),\
   $(KATI_obsolete_var $(m),Please convert to Soong) \