diff --git a/packages/test.sh b/packages/test.sh
index 790d4bf67e8..d15d6648935 100755
--- a/packages/test.sh
+++ b/packages/test.sh
@@ -21,7 +21,11 @@ PACKAGE_DIRS="
 
 for package_dir in $PACKAGE_DIRS; do
     cd "$package_dir"
-    python setup.py install
+    pip install -e .
+    if [ "$package_dir" = "util" ];
+    then
+        pip install -e '.[template,jstree]'
+    fi
     pytest --doctest-modules galaxy tests
     cd ..
 done
diff --git a/packages/util/requirements.txt b/packages/util/requirements.txt
index 3290e4ad496..e15e5db251e 100644
--- a/packages/util/requirements.txt
+++ b/packages/util/requirements.txt
@@ -1,7 +1,6 @@
 bleach
 boltons
 bz2file; python_version < '3.3'
-Cheetah3
 docutils
 markupsafe
 packaging
diff --git a/packages/util/setup.py b/packages/util/setup.py
index ee54c34e225..1227150c7b1 100644
--- a/packages/util/setup.py
+++ b/packages/util/setup.py
@@ -80,6 +80,10 @@ setup(
     package_dir=PACKAGE_DIR,
     include_package_data=True,
     install_requires=requirements,
+    extras_require={
+        'template': ['future', 'Cheetah3'],
+        'jstree': ['dictobj'],
+    },
     license="AFL",
     zip_safe=False,
     keywords='galaxy',