1 files changed, 4 insertions, 10 deletions
diff --git a/test/lisp/obsolete/cl-tests.el b/test/lisp/obsolete/cl-tests.el
index 0b8c1178f3a..659c51ebcf8 100644
--- a/test/lisp/obsolete/cl-tests.el
+++ b/test/lisp/obsolete/cl-tests.el
@@ -25,17 +25,11 @@
   (require 'cl))
 (require 'ert)
 
-
-
-;; Hack to work around the ERT limitation that we can't reliably use
-;; `with-suppressed-warnings' inside an `ert-deftest'.  (Bug#36568)
-(defun cl-tests-labels-test ()
-  (with-suppressed-warnings ((obsolete labels))
-    (funcall (labels ((foo () t))
-                     #'foo))))
-
 (ert-deftest labels-function-quoting ()
   "Test that #'foo does the right thing in `labels'." ; Bug#31792.
-  (should (eq (cl-tests-labels-test) t)))
+  (with-suppressed-warnings ((obsolete labels))
+    (should (eq (funcall (labels ((foo () t))
+                                 #'foo))
+                t))))
 
 ;;; cl-tests.el ends here