diff --git a/superset-frontend/plugins/plugin-chart-country-map/test/plugin/controlPanel.test.ts b/superset-frontend/plugins/plugin-chart-country-map/test/plugin/controlPanel.test.ts
new file mode 100644
index 00000000000..e03aad1ec28
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-country-map/test/plugin/controlPanel.test.ts
@@ -0,0 +1,154 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import controlPanel from '../../src/plugin/controlPanel';
+
+const allControlNames = (): string[] => {
+  const names: string[] = [];
+  controlPanel.controlPanelSections.forEach(section => {
+    if (!section || !section.controlSetRows) return;
+    section.controlSetRows.forEach(row => {
+      row.forEach(cell => {
+        if (typeof cell === 'string') {
+          names.push(cell);
+        } else if (cell && typeof cell === 'object' && 'name' in cell) {
+          names.push((cell as { name: string }).name);
+        }
+      });
+    });
+  });
+  return names;
+};
+
+const findControl = (name: string) => {
+  for (const section of controlPanel.controlPanelSections) {
+    if (!section || !section.controlSetRows) continue;
+    for (const row of section.controlSetRows) {
+      for (const cell of row) {
+        if (
+          cell &&
+          typeof cell === 'object' &&
+          'name' in cell &&
+          (cell as { name: string }).name === name
+        ) {
+          return (cell as { config: any }).config;
+        }
+      }
+    }
+  }
+  return null;
+};
+
+test('all required new controls are present', () => {
+  const names = allControlNames();
+  // The full set of controls the redesign introduced
+  for (const required of [
+    'worldview',
+    'admin_level',
+    'country',
+    'region_set',
+    'composite',
+    'region_includes',
+    'region_excludes',
+    'show_flying_islands',
+    'name_language',
+  ]) {
+    expect(names).toContain(required);
+  }
+});
+
+test('worldview defaults to ukr (Superset editorial choice)', () => {
+  const c = findControl('worldview');
+  expect(c).not.toBeNull();
+  expect(c.default).toBe('ukr');
+});
+
+test('show_flying_islands defaults to true', () => {
+  const c = findControl('show_flying_islands');
+  expect(c).not.toBeNull();
+  expect(c.default).toBe(true);
+});
+
+test('name_language defaults to en', () => {
+  const c = findControl('name_language');
+  expect(c).not.toBeNull();
+  expect(c.default).toBe('en');
+});
+
+test('admin_level offers exactly 0 / 1 / aggregated', () => {
+  const c = findControl('admin_level');
+  expect(c).not.toBeNull();
+  const codes = c.choices.map((ch: [string, string]) => ch[0]);
+  expect(codes).toEqual(['0', '1', 'aggregated']);
+});
+
+test('worldview includes ukr', () => {
+  const c = findControl('worldview');
+  const codes = c.choices.map((ch: [string, string]) => ch[0]);
+  expect(codes).toContain('ukr');
+});
+
+test('country selector visibility hides on Admin 0', () => {
+  const c = findControl('country');
+  expect(c).not.toBeNull();
+  // Admin 0 (number 0 OR string "0") AND no composite → hidden
+  expect(c.visibility({ controls: { admin_level: { value: 0 } } })).toBe(false);
+  expect(c.visibility({ controls: { admin_level: { value: '0' } } })).toBe(false);
+  // Admin 1 → visible
+  expect(c.visibility({ controls: { admin_level: { value: '1' } } })).toBe(true);
+  // Composite set → hidden regardless of admin_level
+  expect(
+    c.visibility({
+      controls: {
+        admin_level: { value: '1' },
+        composite: { value: 'france_overseas' },
+      },
+    }),
+  ).toBe(false);
+});
+
+test('region_set selector only visible when admin_level === aggregated', () => {
+  const c = findControl('region_set');
+  expect(c).not.toBeNull();
+  expect(
+    c.visibility({ controls: { admin_level: { value: 'aggregated' } } }),
+  ).toBe(true);
+  expect(c.visibility({ controls: { admin_level: { value: '1' } } })).toBe(false);
+  expect(c.visibility({ controls: { admin_level: { value: '0' } } })).toBe(false);
+});
+
+test('region_set choices key off the selected country', () => {
+  const c = findControl('region_set');
+  const turChoices = c.choices({ controls: { country: { value: 'TUR' } } });
+  expect(turChoices.length).toBeGreaterThanOrEqual(1);
+  expect(turChoices[0][0]).toBe('nuts_1');
+
+  const fraChoices = c.choices({ controls: { country: { value: 'FRA' } } });
+  expect(fraChoices.length).toBeGreaterThanOrEqual(1);
+  expect(fraChoices[0][0]).toBe('regions');
+
+  // Country with no aggregated regions defined → empty
+  const usaChoices = c.choices({ controls: { country: { value: 'USA' } } });
+  expect(usaChoices).toEqual([]);
+});
+
+test('composite selector includes france_overseas', () => {
+  const c = findControl('composite');
+  const codes = c.choices.map((ch: [string, string]) => ch[0]);
+  expect(codes).toContain('france_overseas');
+});