diff -Nru openjdk-21-21.0.1+12/debian/changelog openjdk-21-21.0.1+12/debian/changelog
--- openjdk-21-21.0.1+12/debian/changelog	2023-11-02 12:20:35.000000000 +0200
+++ openjdk-21-21.0.1+12/debian/changelog	2023-11-06 16:11:20.000000000 +0200
@@ -1,3 +1,11 @@
+openjdk-21 (21.0.1+12-2~22.04) jammy; urgency=medium
+
+  * Upload to Ubuntu 22.04 (LP: #2036873).
+  * d/rules: disable jtreg tests for focal and jammy. No jtreg7 backport
+    yet.
+
+ -- Vladimir Petko <vladimir.petko@canonical.com>  Mon, 06 Nov 2023 16:11:20 +0200
+
 openjdk-21 (21.0.1+12-2) unstable; urgency=medium
 
   [ Vladimir Petko ]
diff -Nru openjdk-21-21.0.1+12/debian/control openjdk-21-21.0.1+12/debian/control
--- openjdk-21-21.0.1+12/debian/control	2023-10-20 10:57:18.000000000 +0300
+++ openjdk-21-21.0.1+12/debian/control	2023-11-06 16:11:19.000000000 +0200
@@ -7,10 +7,10 @@
   m4, lsb-release, zip, unzip,
   sharutils, gawk, cpio, pkg-config, procps, wdiff, fastjar (>= 2:0.96-0ubuntu2),
   time, strip-nondeterminism, debugedit (>= 4.16),
-  jtreg7  <!nocheck>, libtestng7-java <!nocheck>, xvfb <!nocheck>, xauth <!nocheck>, xfonts-base <!nocheck>, libgl1-mesa-dri [!x32] <!nocheck>, xfwm4 <!nocheck>, x11-xkb-utils <!nocheck>, dbus-x11 <!nocheck>, libasmtools-java <!nocheck>, xvfb  <!nocheck>,
+  file,
   autoconf, automake, autotools-dev, ant, ant-optional,
-  g++-13 <!cross>,
-  openjdk-21-jdk-headless:native | openjdk-20-jdk-headless:native,
+  g++-12 <!cross>,
+  openjdk-20-jdk-headless:native | openjdk-21-jdk-headless:native,
   libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libxrandr-dev, libelf-dev, libfontconfig1-dev, libgtk2.0-0 | libgtk-3-0, libfreetype-dev, libharfbuzz-dev,
   libffi-dev, libffi-dev:native,
   zlib1g-dev:native, zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev, 
diff -Nru openjdk-21-21.0.1+12/debian/rules openjdk-21-21.0.1+12/debian/rules
--- openjdk-21-21.0.1+12/debian/rules	2023-10-31 09:22:15.000000000 +0200
+++ openjdk-21-21.0.1+12/debian/rules	2023-11-06 16:11:17.000000000 +0200
@@ -178,7 +178,7 @@
 ifneq (,$(filter $(distrel), precise trusty))
   with_docs =
 endif
-#with_check = disabled for this upload
+with_check = disabled for this upload
 
 with_wqy_zenhai = $(if $(filter $(distrel),lenny),,yes)