diff --git a/Zend/tests/closure_042.phpt b/Zend/tests/closure_042.phpt
index dc849a528211b..bd870b50c0c0b 100644
--- a/Zend/tests/closure_042.phpt
+++ b/Zend/tests/closure_042.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Closure 042: Binding an instance to a non-scoped non-static closures gives it a dummy scope
+Closure 042: Binding an instance to non-scoped non-static closures
 --FILE--
 <?php
 
@@ -20,8 +20,8 @@ echo "Done.\n";
 --EXPECTF--
 object(stdClass)#%d (0) {
 }
-string(7) "Closure"
+string(8) "stdClass"
 object(stdClass)#%d (0) {
 }
-string(7) "Closure"
+string(8) "stdClass"
 Done.
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index e31a31de1d38a..6aa16426d1f05 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -1686,16 +1686,19 @@ ZEND_METHOD(ReflectionFunctionAbstract, getClosureThis)
 ZEND_METHOD(ReflectionFunctionAbstract, getClosureScopeClass)
 {
 	reflection_object *intern;
-	const zend_function *closure_func;
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		RETURN_THROWS();
 	}
 	GET_REFLECTION_OBJECT();
 	if (!Z_ISUNDEF(intern->obj)) {
-		closure_func = zend_get_closure_method_def(Z_OBJ(intern->obj));
-		if (closure_func && closure_func->common.scope) {
-			zend_reflection_class_factory(closure_func->common.scope, return_value);
+		zend_class_entry *called_scope;
+		zend_function *closure_func;
+		zend_object *object;
+		if (Z_OBJ_HANDLER(intern->obj, get_closure)
+		 && Z_OBJ_HANDLER(intern->obj, get_closure)(Z_OBJ(intern->obj), &called_scope, &closure_func, &object, 1) == SUCCESS
+		 && closure_func && (called_scope || closure_func->common.scope)) {
+			zend_reflection_class_factory(called_scope ? (zend_class_entry *) called_scope : closure_func->common.scope, return_value);
 		}
 	}
 }
diff --git a/ext/reflection/tests/gh8932.phpt b/ext/reflection/tests/gh8932.phpt
new file mode 100644
index 0000000000000..e208f92466227
--- /dev/null
+++ b/ext/reflection/tests/gh8932.phpt
@@ -0,0 +1,24 @@
+--TEST--
+GH-8932 (Wrong closure scope class reported for static methods)
+--FILE--
+<?php
+class A {
+    public static function b() {
+        echo static::class;
+    }
+}
+
+class B extends A {}
+
+$c = ['B', 'b'];
+$d = \Closure::fromCallable($c);
+$r = new \ReflectionFunction($d);
+var_dump($r->getClosureScopeClass());
+$d();
+?>
+--EXPECTF--
+object(ReflectionClass)#%d (1) {
+  ["name"]=>
+  string(1) "B"
+}
+B