diff --git a/test/ChangeLog b/test/ChangeLog
index 6e2f89157e3..dca2f7e14fe 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* automated/advice-tests.el (advice-test-call-interactively): Make sure
+	the function's definition is fully restored at the end.
+
 2014-07-12  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
 	* automated/python-tests.el (python-indent-block-enders-1)
diff --git a/test/automated/advice-tests.el b/test/automated/advice-tests.el
index a87d979f919..bbb4adda9fd 100644
--- a/test/automated/advice-tests.el
+++ b/test/automated/advice-tests.el
@@ -160,7 +160,8 @@ function being an around advice."
           (advice-add 'call-interactively :before #'ignore)
           (should (equal (sm-test7.4) '(1 . nil)))
           (should (equal (call-interactively 'sm-test7.4) '(1 . t))))
-      (fset 'call-interactively old))))
+      (advice-remove 'call-interactively #'ignore)
+      (should (eq (symbol-function 'call-interactively) old)))))
 
 (ert-deftest advice-test-interactive ()
   "Check handling of interactive spec."