diff --git a/src/vpp/app/vpp_prometheus_export.c b/src/vpp/app/vpp_prometheus_export.c
index cc85b817063..4fd749af24a 100644
--- a/src/vpp/app/vpp_prometheus_export.c
+++ b/src/vpp/app/vpp_prometheus_export.c
@@ -34,7 +34,7 @@
 #include <ctype.h>
 
 /* https://github.com/prometheus/prometheus/wiki/Default-port-allocations */
-#define SERVER_PORT 9477
+#define SERVER_PORT 9482
 
 static char *
 prom_string (char *s)
diff --git a/test/framework.py b/test/framework.py
index 789ec1be9b9..74cc7ff3a26 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -390,8 +390,8 @@ class VppTestCase(unittest.TestCase):
             else:
                 hook = PollHook(cls)
             cls.vapi.register_hook(hook)
-            cls.statistics = VPPStats(socketname=cls.tempdir+'/stats.sock')
             cls.sleep(0.1, "after vpp startup, before initial poll")
+            cls.statistics = VPPStats(socketname=cls.tempdir+'/stats.sock')
             try:
                 hook.poll_vpp()
             except VppDiedError: