diff --git a/tests/plugins/TesterPlugin/src/AsyncEventConcurrencyTest.php b/tests/plugins/TesterPlugin/src/AsyncEventConcurrencyTest.php
new file mode 100644
index 000000000..f372e8015
--- /dev/null
+++ b/tests/plugins/TesterPlugin/src/AsyncEventConcurrencyTest.php
@@ -0,0 +1,151 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pmmp\TesterPlugin;
+
+use pmmp\TesterPlugin\event\GrandchildAsyncEvent;
+use pocketmine\event\EventPriority;
+use pocketmine\event\HandlerListManager;
+use pocketmine\promise\Promise;
+use pocketmine\promise\PromiseResolver;
+use function var_dump;
+
+final class AsyncEventConcurrencyTest extends Test{
+	/**
+	 * @var PromiseResolver[]
+	 * @phpstan-var list<PromiseResolver<null>>
+	 */
+	private array $resolvers = [];
+
+	private bool $activeExclusiveHandler = false;
+	private bool $activeConcurrentHandler = false;
+
+	private int $done = 0;
+
+	public function getName() : string{
+		return "Async Event Concurrency Lock";
+	}
+
+	public function getDescription() : string{
+		return "Test that exclusive lock on async event handlers works correctly";
+	}
+
+	public function run() : void{
+		HandlerListManager::global()->unregisterAll();
+
+		$main = $this->getPlugin();
+		$pluginManager = $main->getServer()->getPluginManager();
+
+		$pluginManager->registerAsyncEvent(
+			GrandchildAsyncEvent::class,
+			function(GrandchildAsyncEvent $event) use ($main) : ?Promise{
+				if($this->activeExclusiveHandler){
+					$main->getLogger()->error("Concurrent handler can't run while exclusive handlers are waiting to complete");
+					$this->setResult(Test::RESULT_FAILED);
+					return null;
+				}
+				$this->activeConcurrentHandler = true;
+				$resolver = new PromiseResolver();
+				$this->resolvers[] = $resolver;
+				$resolver->getPromise()->onCompletion(
+					fn() => $this->complete($this->activeConcurrentHandler, "concurrent"),
+					fn() => $main->getLogger()->error("Not expecting this to be rejected")
+				);
+				return $resolver->getPromise();
+			},
+			EventPriority::NORMAL,
+			$main,
+			//non-exclusive - this must be completed before any exclusive handlers are run (or run after them)
+		);
+		$pluginManager->registerAsyncEvent(
+			GrandchildAsyncEvent::class,
+			function(GrandchildAsyncEvent $event) use ($main) : ?Promise{
+				$main->getLogger()->info("Entering exclusive handler 1");
+				if($this->activeExclusiveHandler || $this->activeConcurrentHandler){
+					$main->getLogger()->error("Can't run multiple exclusive handlers at once");
+					$this->setResult(Test::RESULT_FAILED);
+					return null;
+				}
+				$this->activeExclusiveHandler = true;
+				$resolver = new PromiseResolver();
+				$this->resolvers[] = $resolver;
+				$resolver->getPromise()->onCompletion(
+					fn() => $this->complete($this->activeExclusiveHandler, "exclusive 1"),
+					fn() => $main->getLogger()->error("Not expecting this to be rejected")
+				);
+				return null;
+			},
+			EventPriority::NORMAL,
+			$main,
+			exclusiveCall: true
+		);
+
+		$pluginManager->registerAsyncEvent(
+			GrandchildAsyncEvent::class,
+			function(GrandchildAsyncEvent $event) use ($main) : ?Promise{
+				$this->getPlugin()->getLogger()->info("Entering exclusive handler 2");
+				if($this->activeExclusiveHandler || $this->activeConcurrentHandler){
+					$main->getLogger()->error("Exclusive lock handlers must not run at the same time as any other handlers");
+					$this->setResult(Test::RESULT_FAILED);
+					return null;
+				}
+				$this->activeExclusiveHandler = true;
+				/** @phpstan-var PromiseResolver<null> $resolver */
+				$resolver = new PromiseResolver();
+				$this->resolvers[] = $resolver;
+				$resolver->getPromise()->onCompletion(
+					function() use ($main) : void{
+						$main->getLogger()->info("Exiting exclusive handler asynchronously");
+						$this->complete($this->activeExclusiveHandler, "exclusive 2");
+					},
+					function() use ($main) : void{
+						$main->getLogger()->error("Not expecting this promise to be rejected");
+						$this->setResult(Test::RESULT_ERROR);
+					}
+				);
+				return $resolver->getPromise();
+			},
+			EventPriority::NORMAL,
+			$main,
+			exclusiveCall: true
+		);
+
+		(new GrandchildAsyncEvent())->call();
+	}
+
+	private function complete(bool &$flag, string $what) : void{
+		$this->getPlugin()->getLogger()->info("Completing $what");
+		$flag = false;
+		if(++$this->done === 3){
+			$this->setResult(Test::RESULT_OK);
+		}
+	}
+
+	public function tick() : void{
+		foreach($this->resolvers as $k => $resolver){
+			$resolver->resolve(null);
+			//don't clear the array here - resolving this will trigger adding the next resolver
+			unset($this->resolvers[$k]);
+		}
+	}
+}
diff --git a/tests/plugins/TesterPlugin/src/AsyncEventInheritanceTest.php b/tests/plugins/TesterPlugin/src/AsyncEventInheritanceTest.php
new file mode 100644
index 000000000..5fc889e70
--- /dev/null
+++ b/tests/plugins/TesterPlugin/src/AsyncEventInheritanceTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pmmp\TesterPlugin;
+
+use pmmp\TesterPlugin\event\ChildAsyncEvent;
+use pmmp\TesterPlugin\event\GrandchildAsyncEvent;
+use pmmp\TesterPlugin\event\ParentAsyncEvent;
+use pocketmine\event\AsyncEvent;
+use pocketmine\event\EventPriority;
+use pocketmine\event\HandlerListManager;
+use pocketmine\promise\Promise;
+use function implode;
+use function shuffle;
+
+final class AsyncEventInheritanceTest extends Test{
+	private const EXPECTED_ORDER = [
+		GrandchildAsyncEvent::class,
+		ChildAsyncEvent::class,
+		ParentAsyncEvent::class
+	];
+	private array $callOrder = [];
+
+	public function getName() : string{
+		return "Async Event Inheritance";
+	}
+
+	public function getDescription() : string{
+		return "Test that async events deliver events to parent handlers correctly in all conditions";
+	}
+
+	public function run() : void{
+		HandlerListManager::global()->unregisterAll();
+
+		$plugin = $this->getPlugin();
+		$classes = self::EXPECTED_ORDER;
+		shuffle($classes);
+		foreach($classes as $event){
+			$plugin->getServer()->getPluginManager()->registerAsyncEvent(
+				$event,
+				function(AsyncEvent $event) : ?Promise{
+					$this->callOrder[] = $event::class;
+					return null;
+				},
+				EventPriority::NORMAL,
+				$plugin
+			);
+		}
+
+		$event = new GrandchildAsyncEvent();
+		$promise = $event->call();
+		$promise->onCompletion(onSuccess: $this->collectResults(...), onFailure: $this->collectResults(...));
+	}
+
+	private function collectResults() : void{
+		if($this->callOrder === self::EXPECTED_ORDER){
+			$this->setResult(Test::RESULT_OK);
+		}else{
+			$this->getPlugin()->getLogger()->error("Expected order: " . implode(", ", self::EXPECTED_ORDER) . ", got: " . implode(", ", $this->callOrder));
+			$this->setResult(Test::RESULT_FAILED);
+		}
+	}
+}
diff --git a/tests/plugins/TesterPlugin/src/AsyncEventPriorityTest.php b/tests/plugins/TesterPlugin/src/AsyncEventPriorityTest.php
new file mode 100644
index 000000000..ac8b56407
--- /dev/null
+++ b/tests/plugins/TesterPlugin/src/AsyncEventPriorityTest.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pmmp\TesterPlugin;
+
+use pmmp\TesterPlugin\event\GrandchildAsyncEvent;
+use pocketmine\event\EventPriority;
+use pocketmine\event\HandlerListManager;
+use pocketmine\promise\Promise;
+use pocketmine\promise\PromiseResolver;
+
+final class AsyncEventPriorityTest extends Test{
+	/**
+	 * @var PromiseResolver[]
+	 * @phpstan-var list<PromiseResolver<null>>
+	 */
+	private array $resolvers = [];
+
+	private bool $firstHandlerCompleted = false;
+
+	public function getName() : string{
+		return "Async Event Handler Priority Lock";
+	}
+
+	public function getDescription() : string{
+		return "Tests that async events do not call handlers from the next priority until all promises from the current priority are resolved";
+	}
+
+	public function run() : void{
+		HandlerListManager::global()->unregisterAll();
+
+		$main = $this->getPlugin();
+		$pluginManager = $main->getServer()->getPluginManager();
+		$pluginManager->registerAsyncEvent(
+			GrandchildAsyncEvent::class,
+			function(GrandchildAsyncEvent $event) use ($main) : Promise{
+				$resolver = new PromiseResolver();
+				$this->resolvers[] = $resolver;
+
+				$resolver->getPromise()->onCompletion(function() : void{
+					$this->firstHandlerCompleted = true;
+				}, function() use ($main) : void{
+					$main->getLogger()->error("Not expecting this to be rejected");
+					$this->setResult(Test::RESULT_ERROR);
+				});
+
+				return $resolver->getPromise();
+			},
+			EventPriority::LOW, //anything below NORMAL is fine
+			$main
+		);
+		$pluginManager->registerAsyncEvent(
+			GrandchildAsyncEvent::class,
+			function(GrandchildAsyncEvent $event) use ($main) : ?Promise{
+				if(!$this->firstHandlerCompleted){
+					$main->getLogger()->error("This shouldn't run until the previous priority is done");
+					$this->setResult(Test::RESULT_FAILED);
+				}else{
+					$this->setResult(Test::RESULT_OK);
+				}
+				return null;
+			},
+			EventPriority::NORMAL,
+			$main
+		);
+
+		(new GrandchildAsyncEvent())->call();
+	}
+
+	public function tick() : void{
+		foreach($this->resolvers as $k => $resolver){
+			$resolver->resolve(null);
+			unset($this->resolvers[$k]);
+		}
+	}
+}
diff --git a/tests/plugins/TesterPlugin/src/Main.php b/tests/plugins/TesterPlugin/src/Main.php
index 26d3441f4..f330af6d9 100644
--- a/tests/plugins/TesterPlugin/src/Main.php
+++ b/tests/plugins/TesterPlugin/src/Main.php
@@ -58,6 +58,9 @@ class Main extends PluginBase implements Listener{
 
 		$this->waitingTests = [
 			new EventHandlerInheritanceTest($this),
+			new AsyncEventInheritanceTest($this),
+			new AsyncEventConcurrencyTest($this),
+			new AsyncEventPriorityTest($this)
 		];
 	}
 
diff --git a/tests/plugins/TesterPlugin/src/event/ChildAsyncEvent.php b/tests/plugins/TesterPlugin/src/event/ChildAsyncEvent.php
new file mode 100644
index 000000000..c54a2503c
--- /dev/null
+++ b/tests/plugins/TesterPlugin/src/event/ChildAsyncEvent.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pmmp\TesterPlugin\event;
+
+final class ChildAsyncEvent extends ParentAsyncEvent{
+
+}
diff --git a/tests/plugins/TesterPlugin/src/event/GrandchildAsyncEvent.php b/tests/plugins/TesterPlugin/src/event/GrandchildAsyncEvent.php
new file mode 100644
index 000000000..f29bf487b
--- /dev/null
+++ b/tests/plugins/TesterPlugin/src/event/GrandchildAsyncEvent.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pmmp\TesterPlugin\event;
+
+class GrandchildAsyncEvent extends \pocketmine\event\AsyncEvent{
+
+}
diff --git a/tests/plugins/TesterPlugin/src/event/ParentAsyncEvent.php b/tests/plugins/TesterPlugin/src/event/ParentAsyncEvent.php
new file mode 100644
index 000000000..5c7796697
--- /dev/null
+++ b/tests/plugins/TesterPlugin/src/event/ParentAsyncEvent.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pmmp\TesterPlugin\event;
+
+class ParentAsyncEvent extends \pocketmine\event\AsyncEvent{
+
+}