diff --git a/elements/opensuse-minimal/README.rst b/elements/opensuse-minimal/README.rst
index 46df3c17..7abe6e5b 100644
--- a/elements/opensuse-minimal/README.rst
+++ b/elements/opensuse-minimal/README.rst
@@ -13,7 +13,7 @@ Environment Variables
 
 DIB_RELEASE
   :Required: No
-  :Default: 42.1
+  :Default: 42.2
   :Description: Set the desired openSUSE release.
 
 DIB_OPENSUSE_MIRROR:
diff --git a/elements/opensuse-minimal/environment.d/10-opensuse-distro-name.bash b/elements/opensuse-minimal/environment.d/10-opensuse-distro-name.bash
index c6aafbbc..db0f4756 100644
--- a/elements/opensuse-minimal/environment.d/10-opensuse-distro-name.bash
+++ b/elements/opensuse-minimal/environment.d/10-opensuse-distro-name.bash
@@ -1,5 +1,5 @@
 export DISTRO_NAME=opensuse
-DIB_RELEASE=${DIB_RELEASE:-42.1}
+DIB_RELEASE=${DIB_RELEASE:-42.2}
 export DIB_RELEASE=${DIB_RELEASE,,}
 export DIB_OPENSUSE_MIRROR=${DIB_OPENSUSE_MIRROR:-http://download.opensuse.org}
 case ${DIB_RELEASE} in
diff --git a/elements/opensuse/README.rst b/elements/opensuse/README.rst
index 5ca0da5e..287f7db2 100644
--- a/elements/opensuse/README.rst
+++ b/elements/opensuse/README.rst
@@ -18,7 +18,7 @@ Environment Variables
 
 DIB_RELEASE
   :Required: No
-  :Default: 13.1
+  :Default: 42.2
   :Description: Set the desired openSUSE release.
 
 DIB_CLOUD_IMAGES
diff --git a/elements/opensuse/environment.d/10-opensuse-distro-name.bash b/elements/opensuse/environment.d/10-opensuse-distro-name.bash
index 38efb86f..a9d195eb 100644
--- a/elements/opensuse/environment.d/10-opensuse-distro-name.bash
+++ b/elements/opensuse/environment.d/10-opensuse-distro-name.bash
@@ -1,5 +1,5 @@
 export DISTRO_NAME=opensuse
-export DIB_RELEASE=${DIB_RELEASE:-13.1}
+export DIB_RELEASE=${DIB_RELEASE:-42.2}
 case ${DIB_RELEASE} in
     # Old openSUSE releases
     13*) export OPENSUSE_REPO_DIR=openSUSE_${DIB_RELEASE} ;;
diff --git a/elements/opensuse/test-elements/build-succeeds/README.rst b/elements/opensuse/test-elements/build-succeeds/README.rst
new file mode 100644
index 00000000..49ba1444
--- /dev/null
+++ b/elements/opensuse/test-elements/build-succeeds/README.rst
@@ -0,0 +1 @@
+Verify we can build an openSUSE image.
diff --git a/elements/zypper-minimal/root.d/08-zypper-chroot b/elements/zypper-minimal/root.d/08-zypper-chroot
index 7e4b22d0..81d49176 100755
--- a/elements/zypper-minimal/root.d/08-zypper-chroot
+++ b/elements/zypper-minimal/root.d/08-zypper-chroot
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2016 SUSE Linux Products Gmb
+# Copyright 2016 SUSE Linux GmbH
 # Copyright 2015 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/tests/run_functests.sh b/tests/run_functests.sh
index 84b6d38e..68c80b15 100755
--- a/tests/run_functests.sh
+++ b/tests/run_functests.sh
@@ -18,6 +18,7 @@ DEFAULT_SKIP_TESTS=(
     fedora/build-succeeds
     # in non-voting
     gentoo/build-succeeds
+    opensuse/build-succeeds
     # good to have the test case around - but because of changes
     # in testing does not work always.
     debian-minimal/testing-build-succeeds