diff --git a/needles/gnome/japanese/desktop_add_input_source-20210615.json b/needles/gnome/japanese/desktop_add_input_source-20210615.json
new file mode 100644
index 00000000..a54ee088
--- /dev/null
+++ b/needles/gnome/japanese/desktop_add_input_source-20210615.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 624,
+      "ypos": 221,
+      "width": 19,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "desktop_add_input_source"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/japanese/desktop_add_input_source-20210615.png b/needles/gnome/japanese/desktop_add_input_source-20210615.png
new file mode 100644
index 00000000..a5379946
Binary files /dev/null and b/needles/gnome/japanese/desktop_add_input_source-20210615.png differ
diff --git a/needles/gnome/japanese/desktop_input_source_japanese-20210615.json b/needles/gnome/japanese/desktop_input_source_japanese-20210615.json
new file mode 100644
index 00000000..bcfcf371
--- /dev/null
+++ b/needles/gnome/japanese/desktop_input_source_japanese-20210615.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 488,
+      "ypos": 478,
+      "width": 49,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "desktop_input_source_japanese"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/japanese/desktop_input_source_japanese-20210615.png b/needles/gnome/japanese/desktop_input_source_japanese-20210615.png
new file mode 100644
index 00000000..a8a49866
Binary files /dev/null and b/needles/gnome/japanese/desktop_input_source_japanese-20210615.png differ
diff --git a/needles/gnome/japanese/desktop_input_source_japanese_anthy-20210615.json b/needles/gnome/japanese/desktop_input_source_japanese_anthy-20210615.json
new file mode 100644
index 00000000..875acb2b
--- /dev/null
+++ b/needles/gnome/japanese/desktop_input_source_japanese_anthy-20210615.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 328,
+      "ypos": 280,
+      "width": 97,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "desktop_input_source_japanese_anthy"
+  ]
+}
diff --git a/needles/gnome/japanese/desktop_input_source_japanese_anthy-20210615.png b/needles/gnome/japanese/desktop_input_source_japanese_anthy-20210615.png
new file mode 100644
index 00000000..3271b5e7
Binary files /dev/null and b/needles/gnome/japanese/desktop_input_source_japanese_anthy-20210615.png differ
diff --git a/needles/gnome/japanese/layout_ascii_japanese-20210615.json b/needles/gnome/japanese/layout_ascii_japanese-20210615.json
new file mode 100644
index 00000000..a2f6dcde
--- /dev/null
+++ b/needles/gnome/japanese/layout_ascii_japanese-20210615.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "width": 18,
+      "height": 17,
+      "xpos": 885,
+      "ypos": 9,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_layout_ascii",
+    "LANGUAGE-japanese"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/japanese/layout_ascii_japanese-20210615.png b/needles/gnome/japanese/layout_ascii_japanese-20210615.png
new file mode 100644
index 00000000..2cb26f1d
Binary files /dev/null and b/needles/gnome/japanese/layout_ascii_japanese-20210615.png differ
diff --git a/needles/gnome/japanese/layout_native_japanese-20210615.json b/needles/gnome/japanese/layout_native_japanese-20210615.json
new file mode 100644
index 00000000..dc145995
--- /dev/null
+++ b/needles/gnome/japanese/layout_native_japanese-20210615.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "width": 18,
+      "ypos": 8,
+      "type": "match",
+      "xpos": 886,
+      "height": 16
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "gnome_layout_native",
+    "LANGUAGE-japanese"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/japanese/layout_native_japanese-20210615.png b/needles/gnome/japanese/layout_native_japanese-20210615.png
new file mode 100644
index 00000000..9300e11c
Binary files /dev/null and b/needles/gnome/japanese/layout_native_japanese-20210615.png differ
diff --git a/needles/gnome/japanese/yama_chooser-20210615.json b/needles/gnome/japanese/yama_chooser-20210615.json
new file mode 100644
index 00000000..05a1a010
--- /dev/null
+++ b/needles/gnome/japanese/yama_chooser-20210615.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "ypos": 128,
+      "type": "match",
+      "xpos": 362,
+      "height": 20,
+      "width": 33
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-gnome",
+    "LANGUAGE-japanese",
+    "desktop_yama_chooser"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/japanese/yama_chooser-20210615.png b/needles/gnome/japanese/yama_chooser-20210615.png
new file mode 100644
index 00000000..20aac627
Binary files /dev/null and b/needles/gnome/japanese/yama_chooser-20210615.png differ
diff --git a/tests/_graphical_input.pm b/tests/_graphical_input.pm
index 9070b391..a7a3af74 100644
--- a/tests/_graphical_input.pm
+++ b/tests/_graphical_input.pm
@@ -4,6 +4,20 @@ use testapi;
 use utils;
 
 sub run {
+    my $relnum = get_release_number;
+    if (get_var("LANGUAGE") eq 'japanese' && $relnum > 33) {
+        # since g-i-s new user mode was dropped and the replacement
+        # doesn't do input method selection, and anaconda never has,
+        # we have to set up the input method manually:
+        # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3749
+        menu_launch_type "keyboard";
+        assert_and_click "desktop_add_input_source";
+        assert_and_click "desktop_input_source_japanese";
+        assert_and_click "desktop_input_source_japanese_anthy";
+        send_key "ret";
+        wait_still_screen 3;
+        send_key "alt-f4";
+    }
     # do this from the overview because the desktop uses the stupid
     # transparent top bar which messes with our needles
     send_key "alt-f1";