diff --git a/test-upper-constraints.txt b/test-upper-constraints.txt
index fe1a36516e..529cd6e8f1 100644
--- a/test-upper-constraints.txt
+++ b/test-upper-constraints.txt
@@ -1 +1 @@
-git+https://opendev.org/openstack/python-troveclient#egg=python-troveclient
+git+https://opendev.org/openstack/python-troveclient@stable/train#egg=python-troveclient
diff --git a/tox.ini b/tox.ini
index c9ee5c8434..78fdc4d420 100644
--- a/tox.ini
+++ b/tox.ini
@@ -122,11 +122,7 @@ deps =
 
 [testenv:trovestack]
 basepython = python3
-skip_install = True
 changedir = {toxinidir}/integration/scripts
 passenv = *
 commands =
-    pip install --no-binary :all: {toxinidir} \
-      -c/opt/stack/trove/test-upper-constraints.txt \
-      -chttps://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt
     ./trovestack {posargs}
diff --git a/trove/tests/scenario/runners/guest_log_runners.py b/trove/tests/scenario/runners/guest_log_runners.py
index aebae74b9d..34e50b60b3 100644
--- a/trove/tests/scenario/runners/guest_log_runners.py
+++ b/trove/tests/scenario/runners/guest_log_runners.py
@@ -727,9 +727,9 @@ class GuestLogRunner(TestRunner):
             self.admin_client,
             log_name,
             expected_type=guest_log.LogType.SYS.name,
-            expected_status=guest_log.LogStatus.Partial.name,
-            expected_published=1, expected_pending=1,
-            is_admin=True)
+            expected_status=[guest_log.LogStatus.Published.name,
+                             guest_log.LogStatus.Partial.name],
+            expected_published=1, is_admin=True)
 
     def run_test_log_publish_again_sys(self):
         log_name = self._get_unexposed_sys_log_name()
@@ -737,9 +737,9 @@ class GuestLogRunner(TestRunner):
             self.admin_client,
             log_name,
             expected_type=guest_log.LogType.SYS.name,
-            expected_status=guest_log.LogStatus.Partial.name,
+            expected_status=[guest_log.LogStatus.Published.name,
+                             guest_log.LogStatus.Partial.name],
             expected_published=self._get_last_log_published(log_name) + 1,
-            expected_pending=1,
             is_admin=True)
 
     def run_test_log_generator_sys(self):