diff --git a/testsuite/dynaconf_loader.py b/testsuite/dynaconf_loader.py
index f2f0ac3e7..93b55e120 100644
--- a/testsuite/dynaconf_loader.py
+++ b/testsuite/dynaconf_loader.py
@@ -60,9 +60,8 @@ def _guess_version(ocp, namespace):
     """Attempt to determine version from amp-system imagestream"""
 
     version = None
-    # TODO: ImageStreams are no longer used by 3scale; https://github.com/3scale-qe/3scale-tests/issues/816
     try:
-        version = ocp.image_stream_tag_from_trigger("dc/apicast-production")
+        version = ocp.api_manager.get_annotation("apps.3scale.net/apimanager-threescale-version")
         Version(version)
         if _is_devrelease(namespace):
             version += "-dev"