diff --git a/snapcraft.yaml b/snapcraft.yaml
index 338e624..20577cc 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1571,7 +1571,7 @@ parts:
       cat $SNAPCRAFT_PROJECT_DIR/filebeat.pgp.key | apt-key add -
       cat $SNAPCRAFT_PROJECT_DIR/telegraf.pgp.key | apt-key add -
       apt-get install apt-transport-https
-      echo 'deb https://artifacts.elastic.co/packages/5.x/apt stable main' > /etc/apt/sources.list.d/elastic-5.x.list
+      echo 'deb https://artifacts.elastic.co/packages/7.x/apt stable main' > /etc/apt/sources.list.d/elastic-7.x.list
       echo 'deb http://ppa.launchpad.net/telegraf-devs/ppa/ubuntu bionic main' > /etc/apt/sources.list.d/telegraf.x.list
       # this needs to be re-worked in order to be built in-place
       echo 'deb http://ppa.launchpad.net/nikolay.vinogradov/nrpe-root/ubuntu bionic main' > /etc/apt/sources.list.d/nrpe-root.list
diff --git a/tests/test_cluster.py b/tests/test_cluster.py
index 684ab38..e898618 100755
--- a/tests/test_cluster.py
+++ b/tests/test_cluster.py
@@ -131,7 +131,14 @@ class TestCluster(Framework):
 
         self.assertTrue(ip)
 
-        control_host.check_call(['ping', '-c10', '-w11', ip])
+        # Ensure instance has enough time to initialize
+        @tenacity.retry(wait=tenacity.wait_fixed(1),
+                        stop=tenacity.stop_after_attempt(10))
+        def wait_ping():
+            control_host.check_call(['ping', '-c10', '-w11', ip])
+
+        wait_ping()
+
         self.passed = True