diff --git a/tests/drivers/stepper/drv84xx/emul/CMakeLists.txt b/tests/drivers/stepper/drv84xx/CMakeLists.txt
similarity index 100%
rename from tests/drivers/stepper/drv84xx/emul/CMakeLists.txt
rename to tests/drivers/stepper/drv84xx/CMakeLists.txt
diff --git a/tests/drivers/stepper/drv84xx/emul/Kconfig b/tests/drivers/stepper/drv84xx/Kconfig
similarity index 100%
rename from tests/drivers/stepper/drv84xx/emul/Kconfig
rename to tests/drivers/stepper/drv84xx/Kconfig
diff --git a/tests/drivers/stepper/drv84xx/emul/boards/native_sim.overlay b/tests/drivers/stepper/drv84xx/app.overlay
similarity index 100%
rename from tests/drivers/stepper/drv84xx/emul/boards/native_sim.overlay
rename to tests/drivers/stepper/drv84xx/app.overlay
diff --git a/tests/drivers/stepper/drv84xx/emul/prj.conf b/tests/drivers/stepper/drv84xx/prj.conf
similarity index 100%
rename from tests/drivers/stepper/drv84xx/emul/prj.conf
rename to tests/drivers/stepper/drv84xx/prj.conf
diff --git a/tests/drivers/stepper/drv84xx/emul/src/main.c b/tests/drivers/stepper/drv84xx/src/main.c
similarity index 72%
rename from tests/drivers/stepper/drv84xx/emul/src/main.c
rename to tests/drivers/stepper/drv84xx/src/main.c
index e8659878844c5..f2ca77b0e2cf5 100644
--- a/tests/drivers/stepper/drv84xx/emul/src/main.c
+++ b/tests/drivers/stepper/drv84xx/src/main.c
@@ -32,23 +32,15 @@ static void *drv84xx_emul_setup(void)
 	return &fixture;
 }
 
-static void drv84xx_emul_before(void *f)
-{
-	struct drv84xx_emul_fixture *fixture = f;
-	(void)stepper_set_reference_position(fixture->dev, 0);
-	(void)stepper_set_micro_step_res(fixture->dev, 1);
-}
-
-static void drv84xx_emul_after(void *f)
-{
-	struct drv84xx_emul_fixture *fixture = f;
-	(void)stepper_disable(fixture->dev);
-}
-
-ZTEST_F(drv84xx_emul, test_enable_on_gpio_pins)
+ZTEST_F(drv84xx_emul, test_enable_gpio_pins)
 {
 	int value = 0;
-	(void)stepper_enable(fixture->dev);
+	int err;
+
+	err = stepper_enable(fixture->dev);
+	if (err == -ENOTSUP) {
+		ztest_test_skip();
+	}
 	/* As sleep and enable pins are optional, check if they exist*/
 	if (en_pin.port != NULL) {
 		value = gpio_emul_output_get(en_pin.port, en_pin.pin);
@@ -58,17 +50,10 @@ ZTEST_F(drv84xx_emul, test_enable_on_gpio_pins)
 		value = !gpio_emul_output_get(slp_pin.port, slp_pin.pin);
 		zassert_equal(value, 0, "Sleep pin should not be set");
 	}
-}
 
-ZTEST_F(drv84xx_emul, test_enable_off_gpio_pins)
-{
-	int value = 0;
-	/* Enable first to ensure that disable works correctly and the check is not against values
-	 * from initialisation or from previous tests
-	 */
-	(void)stepper_enable(fixture->dev);
-	(void)stepper_disable(fixture->dev);
-	/* As sleep and enable pins are optional, check if they exist*/
+	/* As enable is supported, disable must also be supported */
+	zassert_ok(stepper_disable(fixture->dev));
+
 	if (en_pin.port != NULL) {
 		value = gpio_emul_output_get(en_pin.port, en_pin.pin);
 		zassert_equal(value, 0, "Enable pin should not be set");
@@ -101,4 +86,4 @@ ZTEST_F(drv84xx_emul, test_micro_step_res_set)
 		      res);
 }
 
-ZTEST_SUITE(drv84xx_emul, NULL, drv84xx_emul_setup, drv84xx_emul_before, drv84xx_emul_after, NULL);
+ZTEST_SUITE(drv84xx_emul, NULL, drv84xx_emul_setup, NULL, NULL, NULL);
diff --git a/tests/drivers/stepper/drv84xx/emul/testcase.yaml b/tests/drivers/stepper/drv84xx/testcase.yaml
similarity index 63%
rename from tests/drivers/stepper/drv84xx/emul/testcase.yaml
rename to tests/drivers/stepper/drv84xx/testcase.yaml
index 5ea422718caa4..861758ddf6929 100644
--- a/tests/drivers/stepper/drv84xx/emul/testcase.yaml
+++ b/tests/drivers/stepper/drv84xx/testcase.yaml
@@ -1,11 +1,14 @@
 # Copyright (c) 2024 Navimatix GmbH
 # SPDX-License-Identifier: Apache-2.0
 
+common:
+  tags:
+    - drivers
+    - stepper
+    - drv84xx
+
 tests:
   drivers.stepper.drv84xx.emul:
-    tags:
-      - drivers
-      - stepper
-      - drv84xx
     platform_allow:
       - native_sim
+      - native_sim/native/64
diff --git a/tests/drivers/stepper/shell/CMakeLists.txt b/tests/drivers/stepper/shell/CMakeLists.txt
index 7a7892c68da6e..7afca16e6238d 100644
--- a/tests/drivers/stepper/shell/CMakeLists.txt
+++ b/tests/drivers/stepper/shell/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(can_shell)
+project(stepper_shell)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/stepper/shell/testcase.yaml b/tests/drivers/stepper/shell/testcase.yaml
index 4a7dbd3524350..0c9d4f16eac6b 100644
--- a/tests/drivers/stepper/shell/testcase.yaml
+++ b/tests/drivers/stepper/shell/testcase.yaml
@@ -9,7 +9,3 @@ tests:
     platform_allow:
       - native_sim
       - native_sim/native/64
-  drivers.stepper.shell_async:
-    platform_allow:
-      - native_sim
-      - native_sim/native/64