diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/analysis/{{cookiecutter.template_analysis_class.lower()}}.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/analysis/{{cookiecutter.template_analysis_class.lower()}}.py
index 2c63c77c..9191436b 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/analysis/{{cookiecutter.template_analysis_class.lower()}}.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/analysis/{{cookiecutter.template_analysis_class.lower()}}.py
@@ -21,7 +21,7 @@ class {{ cookiecutter.template_analysis_class }}(AnalysisBase):
 
     Parameters
     ----------
-    universe_or_atomgroup: :class:`~MDAnalysis.core.universe.Universe` or :class:`~MDAnalysis.core.groups.AtomGroup`
+    universe_or_atomgroup: Universe or AtomGroup
         Universe or group of atoms to apply this analysis to.
         If a trajectory is associated with the atoms,
         then the computation iterates over the trajectory.
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/tests/test_{{cookiecutter.package_name}}.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/tests/test_{{cookiecutter.package_name}}.py
index cf39c940..15fff86c 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/tests/test_{{cookiecutter.package_name}}.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/tests/test_{{cookiecutter.package_name}}.py
@@ -3,9 +3,9 @@
 """
 
 # Import package, test suite, and other packages as needed
-import {{cookiecutter.package_name}}
-import pytest
 import sys
+import pytest
+import {{cookiecutter.package_name}}
 
 
 def test_{{cookiecutter.package_name}}_imported():