diff --git a/tools/data_source/upload.py b/tools/data_source/upload.py
index 85271e69212..fa5d3785c7f 100644
--- a/tools/data_source/upload.py
+++ b/tools/data_source/upload.py
@@ -14,6 +14,8 @@ import urllib
 import zipfile
 
 from galaxy import util
+# need to import model before sniff to resolve a circular import dependency
+import galaxy.model  # noqa
 from galaxy.datatypes import sniff
 from galaxy.datatypes.binary import Binary
 from galaxy.datatypes.checkers import check_binary, check_bz2, check_gzip, check_html, check_image, check_zip