diff --git a/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
index 6c843abd05a..c13bba6df85 100644
--- a/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
@@ -9,9 +9,7 @@ Require-Bundle: org.eclipse.help.ui,
  org.eclipse.ui.cheatsheets,
  org.eclipse.ui.intro,
  org.eclipse.ui.intro.universal,
- org.eclipse.ui.forms,
- org.eclipse.equinox.jsp.jasper.registry;bundle-version="1.0.100",
- org.eclipse.equinox.http.registry;bundle-version="1.3.100"
+ org.eclipse.ui.forms
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse.org
 Import-Package: javax.servlet;version="3.1.0",
@@ -26,36 +24,64 @@ Import-Package: javax.servlet;version="3.1.0",
  org.junit.platform.suite.api;version="[1.14.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: org.eclipse.ua.tests,
- org.eclipse.ua.tests.browser.servlet,
+ org.eclipse.ua.tests.browser.servlet;uses:="javax.servlet.http",
  org.eclipse.ua.tests.cheatsheet,
- org.eclipse.ua.tests.cheatsheet.composite,
- org.eclipse.ua.tests.cheatsheet.execution,
- org.eclipse.ua.tests.cheatsheet.other,
+ org.eclipse.ua.tests.cheatsheet.composite;uses:="org.eclipse.ui.internal.provisional.cheatsheets",
+ org.eclipse.ua.tests.cheatsheet.execution;
+  uses:="org.eclipse.core.commands,
+   org.eclipse.jface.action,
+   org.eclipse.ui.cheatsheets,
+   org.eclipse.ui.internal.cheatsheets.views",
+ org.eclipse.ua.tests.cheatsheet.other;uses:="org.eclipse.ui.internal.cheatsheets.views",
  org.eclipse.ua.tests.cheatsheet.parser,
- org.eclipse.ua.tests.cheatsheet.performance,
- org.eclipse.ua.tests.cheatsheet.util,
+ org.eclipse.ua.tests.cheatsheet.performance;uses:="org.eclipse.test.performance,org.junit.jupiter.api",
+ org.eclipse.ua.tests.cheatsheet.util;
+  uses:="org.eclipse.core.runtime,
+   org.eclipse.jface.action,
+   org.eclipse.swt.widgets,
+   org.eclipse.ui,
+   org.eclipse.ui.cheatsheets,
+   org.eclipse.ui.forms.widgets,
+   org.eclipse.ui.internal.cheatsheets.data,
+   org.eclipse.ui.internal.provisional.cheatsheets",
  org.eclipse.ua.tests.help,
- org.eclipse.ua.tests.help.criteria,
- org.eclipse.ua.tests.help.dynamic,
+ org.eclipse.ua.tests.help.criteria;uses:="org.eclipse.help",
+ org.eclipse.ua.tests.help.dynamic;uses:="org.osgi.framework",
  org.eclipse.ua.tests.help.index,
- org.eclipse.ua.tests.help.other,
- org.eclipse.ua.tests.help.performance,
+ org.eclipse.ua.tests.help.other;uses:="org.eclipse.core.expressions,org.eclipse.help",
+ org.eclipse.ua.tests.help.performance;uses:="org.eclipse.test.performance,org.junit.jupiter.api",
  org.eclipse.ua.tests.help.preferences,
- org.eclipse.ua.tests.help.remote,
- org.eclipse.ua.tests.help.scope,
- org.eclipse.ua.tests.help.search,
- org.eclipse.ua.tests.help.toc,
- org.eclipse.ua.tests.help.util,
- org.eclipse.ua.tests.help.webapp,
- org.eclipse.ua.tests.help.webapp.service,
- org.eclipse.ua.tests.help.webextension,
+ org.eclipse.ua.tests.help.remote;
+  uses:="javax.servlet.http,
+   org.eclipse.help,
+   org.eclipse.help.internal.server,
+   org.eclipse.help.internal.toc,
+   org.eclipse.help.internal.webapp.servlet,
+   org.eclipse.ua.tests.help.other,
+   org.w3c.dom",
+ org.eclipse.ua.tests.help.scope;uses:="org.eclipse.help,org.eclipse.help.base",
+ org.eclipse.ua.tests.help.search;
+  uses:="org.eclipse.core.runtime,
+   org.eclipse.help,
+   org.eclipse.help.internal.search,
+   org.eclipse.help.search,
+   org.xml.sax",
+ org.eclipse.ua.tests.help.toc;uses:="org.eclipse.help",
+ org.eclipse.ua.tests.help.util;uses:="javax.servlet.http,org.eclipse.help",
+ org.eclipse.ua.tests.help.webapp;uses:="javax.servlet,javax.servlet.http,org.eclipse.help.webapp",
+ org.eclipse.ua.tests.help.webapp.service;uses:="org.eclipse.ua.tests.help.remote,org.w3c.dom",
+ org.eclipse.ua.tests.help.webextension;
+  uses:="javax.servlet,
+   javax.servlet.http,
+   org.eclipse.help.internal.webapp.data,
+   org.eclipse.help.webapp",
  org.eclipse.ua.tests.intro,
  org.eclipse.ua.tests.intro.anchors,
  org.eclipse.ua.tests.intro.contentdetect,
  org.eclipse.ua.tests.intro.other,
  org.eclipse.ua.tests.intro.parser,
- org.eclipse.ua.tests.intro.performance,
- org.eclipse.ua.tests.intro.util,
- org.eclipse.ua.tests.util
+ org.eclipse.ua.tests.intro.performance;uses:="org.eclipse.test.performance,org.junit.jupiter.api",
+ org.eclipse.ua.tests.intro.util;uses:="org.eclipse.ui.internal.intro.impl.model",
+ org.eclipse.ua.tests.util;uses:="org.eclipse.help,org.osgi.framework"
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.ua.tests