Forwarded upstream: https://github.com/jorgenschaefer/elpy/pull/2031

diff --git a/test/elpy-config--insert-help-test.el b/test/elpy-config--insert-help-test.el
index bb293ff..2584fd4 100644
--- a/test/elpy-config--insert-help-test.el
+++ b/test/elpy-config--insert-help-test.el
@@ -2,6 +2,6 @@
 ;; with output. We will test its constituent functions later, and just
 ;; make sure it doesn't throw an error here.
 
-(ert-deftest elpy-config-should-not-fail ()
+(ert-deftest elpy-config-should-not-fail-insert-help ()
   (elpy-testcase ()
     (elpy-config--insert-help)))
diff --git a/test/elpy-library-root-test.el b/test/elpy-library-root-test.el
index fdc88b2..2f7484c 100644
--- a/test/elpy-library-root-test.el
+++ b/test/elpy-library-root-test.el
@@ -4,7 +4,7 @@
     (should (f-equal? (elpy-library-root)
                       project-root))))
 
-(ert-deftest elpy-library-root-should-find-current-directory ()
+(ert-deftest elpy-library-root-should-find-current-directory-2 ()
   (elpy-testcase ((:project project-root
                             "p1/p2/test.py"
                             "p1/p2/__init__.py"
diff --git a/test/elpy-open-and-indent-line-above-test.el b/test/elpy-open-and-indent-line-above-test.el
index d846712..790dd26 100644
--- a/test/elpy-open-and-indent-line-above-test.el
+++ b/test/elpy-open-and-indent-line-above-test.el
@@ -1,4 +1,4 @@
-(ert-deftest elpy-open-and-indent-line-below ()
+(ert-deftest elpy-open-and-indent-line-above ()
   (elpy-testcase ()
     (elpy-enable)
     (python-mode)
diff --git a/test/elpy-rpc-get-usages-test.el b/test/elpy-rpc-get-usages-test.el
index 85f0ad4..be5d7c5 100644
--- a/test/elpy-rpc-get-usages-test.el
+++ b/test/elpy-rpc-get-usages-test.el
@@ -1,4 +1,4 @@
-(ert-deftest elpy-rpc-get-completions ()
+(ert-deftest elpy-rpc-get-completions-usages ()
   (elpy-testcase ()
     (mletf* ((called-args nil)
              (elpy-rpc (&rest args) (setq called-args args)))
diff --git a/test/elpy-rpc-test.el b/test/elpy-rpc-test.el
index 8b5bdca..3ff6965 100644
--- a/test/elpy-rpc-test.el
+++ b/test/elpy-rpc-test.el
@@ -17,7 +17,7 @@
               (should (equal error 'elpy-rpc--default-error-callback))))
       (elpy-rpc "test-method" nil 'success))))
 
-(ert-deftest elpy-rpc-should-use-default-without-error-callback ()
+(ert-deftest elpy-rpc-should-use-default-without-error-callback-2 ()
   (elpy-testcase ()
     (mletf* ((elpy-rpc--call-blocking
               (method params)
ef='/guix/log/build-aux/compile-all.scm?id=e9930a4cff2dbd3606a6c58887caa25c7589e83b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-06-23 23:35:27 +0200'>2021-06-23</span></td><td><a href='/guix/commit/build-aux/compile-all.scm?id=ef82ba9dd94369926eb13325d5e7da4306d23dd7'>build: Makefile splits Scheme compilation in four steps.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/48963&gt;.
Reported by Julien Lepiller &lt;julien@lepiller.eu&gt;.

This reduces peak memory consumption to something less unreasonable.

* Makefile.am (make-go): Depend on 'make-*-go' targets; remove body.
(guile-compilation-rule): New function.
(MODULES_CORE, MODULES_PACKAGES, MODULES_SYSTEM, MODULES_CLI): New
variables.
&lt;top level&gt;: Call 'guile-compilation-rule' 4 times.
* build-aux/compile-all.scm &lt;top level&gt;: Expect "--total" and
"--processed".  Take them into account when displaying progress
reports.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-06-18 14:18:06 +0200'>2021-06-18</span></td><td><a href='/guix/commit/build-aux/compile-all.scm?id=003728cfab907be5df1411c5faaf466a2b8d5ba2'>build: Remove Guile 2.2 workaround.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/compile-all.scm &lt;top level&gt;: Remove Guile 2.2 workaround.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-04-12 00:00:59 +0200'>2020-04-12</span></td><td><a href='/guix/commit/build-aux/compile-all.scm?id=27a1e4fd109f6df9f687958cfead0d3e41e330aa'>build: Cap build parallelism on i686.</a><span class='msg-avail'>...<span class='msg-tooltip'>Works around &lt;https://bugs.gnu.org/40522&gt;.

* build-aux/compile-all.scm (parallel-job-count*): New procedure.
&lt;top level&gt;: Use it instead of 'parallel-job-count'.
</span></span></td><td>Ludovic Courtès</td></tr>