diff --git a/.travis.yml b/.travis.yml
index 4138656..db9c125 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,6 +65,7 @@ jobs:
     # - env: INSTANCE=v3000-py3-centos-7-3000-3-py3
     - env: INSTANCE=v3000-py3-fedora-31-3000-3-py3
     - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-3-py3
+    - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-3-py3
     - env: INSTANCE=v3000-py3-amazonlinux-2-3000-3-py3
     - env: INSTANCE=v3000-py2-ubuntu-1804-3000-3-py2
     # - env: INSTANCE=v3000-py2-ubuntu-1604-3000-3-py2
@@ -74,8 +75,6 @@ jobs:
     - env: INSTANCE=v201902-py3-ubuntu-1604-2019-2-py3
     # - env: INSTANCE=v201902-py3-centos-8-2019-2-py3
     - env: INSTANCE=v201902-py3-centos-7-2019-2-py3
-    # - env: INSTANCE=v201902-py3-fedora-31-2019-2-py3
-    - env: INSTANCE=v201902-py3-opensuse-leap-151-2019-2-py3
     # - env: INSTANCE=v201902-py3-amazonlinux-2-2019-2-py3
     - env: INSTANCE=v201902-py2-centos-6-2019-2-py2
     # - env: INSTANCE=v201902-py2-amazonlinux-1-2019-2-py2
diff --git a/kitchen.yml b/kitchen.yml
index 257fec1..314c194 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -38,6 +38,14 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+  - name: opensuse-leap-151-3000-3-py3
+    driver:
+      image: netmanagers/salt-3000.3-py3:opensuse-leap-15.1
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
   - name: amazonlinux-2-3000-3-py3
     driver:
       image: netmanagers/salt-3000.3-py3:amazonlinux-2
@@ -67,17 +75,6 @@ platforms:
   - name: centos-7-2019-2-py3
     driver:
       image: netmanagers/salt-2019.2-py3:centos-7
-  - name: fedora-31-2019-2-py3
-    driver:
-      image: netmanagers/salt-2019.2-py3:fedora-31
-  - name: opensuse-leap-151-2019-2-py3
-    driver:
-      image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
   - name: amazonlinux-2-2019-2-py3
     driver:
       image: netmanagers/salt-2019.2-py3:amazonlinux-2
@@ -118,6 +115,7 @@ suites:
       - centos-7-3000-3-py3
       - fedora-31-3000-3-py3
       - opensuse-leap-152-3000-3-py3
+      - opensuse-leap-151-3000-3-py3
       - amazonlinux-2-3000-3-py3
     provisioner:
       state_top:
@@ -169,8 +167,6 @@ suites:
       - ubuntu-1604-2019-2-py3
       - centos-8-2019-2-py3
       - centos-7-2019-2-py3
-      - fedora-31-2019-2-py3
-      - opensuse-leap-151-2019-2-py3
       - amazonlinux-2-2019-2-py3
     provisioner:
       state_top: