diff --git a/test/distrotest b/test/distrotest
index 5024054..d706185 100755
--- a/test/distrotest
+++ b/test/distrotest
@@ -61,11 +61,11 @@ done << EOF
 debian:stable         apt-get update && apt-get install -y cabal-install
 debian:testing        apt-get update && apt-get install -y cabal-install
 ubuntu:latest         apt-get update && apt-get install -y cabal-install
-opensuse:latest       zypper install -y cabal-install ghc
+opensuse/leap:latest  zypper install -y cabal-install ghc
 
-# Older Ubuntu versions we want to support
-ubuntu:18.04          apt-get update && apt-get install -y cabal-install
-ubuntu:17.10          apt-get update && apt-get install -y cabal-install
+# Other Ubuntu versions we want to support
+ubuntu:19.04          apt-get update && apt-get install -y cabal-install
+ubuntu:18.10          apt-get update && apt-get install -y cabal-install
 
 # Misc Haskell including current and latest Stack build
 ubuntu:18.10          set -e; apt-get update && apt-get install -y curl && curl -sSL https://get.haskellstack.org/ | sh -s - -f && cd /mnt && exec test/stacktest
@@ -74,7 +74,7 @@ haskell:latest        true
 # Known to currently fail
 centos:latest         yum install -y epel-release && yum install -y cabal-install
 fedora:latest         dnf install -y cabal-install
-base/archlinux:latest pacman -S -y --noconfirm cabal-install ghc-static base-devel
+archlinux/base:latest pacman -S -y --noconfirm cabal-install ghc-static base-devel
 EOF
 
 exit "$final"