diff -Nru libsecret-0.18.6/debian/changelog libsecret-0.18.6/debian/changelog
--- libsecret-0.18.6/debian/changelog	2018-05-03 12:29:15.000000000 +0000
+++ libsecret-0.18.6/debian/changelog	2018-09-27 18:46:00.000000000 +0000
@@ -1,3 +1,10 @@
+libsecret (0.18.6-3) unstable; urgency=medium
+
+  * Don't Build-Depend on gjs on s390x and stop running js tests there
+    in preparation for removing gjs on s390x (#909536) (LP: #1794721)
+
+ -- Jeremy Bicha <jbicha@debian.org>  Thu, 27 Sep 2018 14:46:00 -0400
+
 libsecret (0.18.6-2) unstable; urgency=medium
 
   * debian/rules: fix logic error in nocheck handling (Closes: #897596)
diff -Nru libsecret-0.18.6/debian/control libsecret-0.18.6/debian/control
--- libsecret-0.18.6/debian/control	2018-05-03 12:29:15.000000000 +0000
+++ libsecret-0.18.6/debian/control	2018-09-27 18:46:00.000000000 +0000
@@ -19,7 +19,7 @@
                python3-gi,
                gnome-pkg-tools,
                dbus <!nocheck>,
-               gjs <!nocheck>
+               gjs [!s390x] <!nocheck>
 Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/gnome-team/libsecret
 Vcs-Git: https://salsa.debian.org/gnome-team/libsecret.git
diff -Nru libsecret-0.18.6/debian/control.in libsecret-0.18.6/debian/control.in
--- libsecret-0.18.6/debian/control.in	2018-05-03 12:29:15.000000000 +0000
+++ libsecret-0.18.6/debian/control.in	2018-09-27 18:46:00.000000000 +0000
@@ -15,7 +15,7 @@
                python3-gi,
                gnome-pkg-tools,
                dbus <!nocheck>,
-               gjs <!nocheck>
+               gjs [!s390x] <!nocheck>
 Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/gnome-team/libsecret
 Vcs-Git: https://salsa.debian.org/gnome-team/libsecret.git
diff -Nru libsecret-0.18.6/debian/rules libsecret-0.18.6/debian/rules
--- libsecret-0.18.6/debian/rules	2018-05-03 12:29:15.000000000 +0000
+++ libsecret-0.18.6/debian/rules	2018-09-27 18:46:00.000000000 +0000
@@ -6,10 +6,12 @@
 %:
 	dh $@ --with gir,gnome
 
-# Some tests hang on Launchpad builders on s390x
+# We can't depend on gjs being available on s390x. See #909536
+# Also, some tests hang on Launchpad builders on s390x
 override_dh_autoreconf:
-ifeq (yes,$(shell dpkg-vendor --is Ubuntu && echo yes))
 ifneq (,$(filter $(DEB_HOST_ARCH),s390x))
+	sed -i -e '/^TESTS/s/\$$(JS_TESTS)//' libsecret/Makefile.am
+ifeq (yes,$(shell dpkg-vendor --is Ubuntu && echo yes))
 	sed -i -e '/^TESTS/s/\$$(PY_TESTS)//' -e '/^TESTS/s/\$$(VALA_TESTS)//' \
 		 libsecret/Makefile.am
 endif