diff --git a/gaff2xml/tests/test_drugs_no_oechem.py b/gaff2xml/tests/test_drugs_no_oechem.py
index e063f07..5931d2c 100644
--- a/gaff2xml/tests/test_drugs_no_oechem.py
+++ b/gaff2xml/tests/test_drugs_no_oechem.py
@@ -13,7 +13,7 @@ def test_drugs():
     
     n_molecules = 3404
     CHARGE_METHOD = "bcc"
-    if os.environ.get("TRAVIS", None) == 'true':
+    if (os.environ.get("TRAVIS", None) == 'true') or (os.environ.get("JENKINS_URL", None) is not None):
         n_molecules = 25  # If running on travis, only test the first 25 molecules due to speed.
         CHARGE_METHOD = None  # Travis is actually too slow to do a single bcc calculation!
 
diff --git a/gaff2xml/tests/test_freesolv.py b/gaff2xml/tests/test_freesolv.py
index cc7334c..5f8d50c 100644
--- a/gaff2xml/tests/test_freesolv.py
+++ b/gaff2xml/tests/test_freesolv.py
@@ -14,6 +14,7 @@
 
 @skipIf(find_executable('obabel') is None, 'You need obabel installed to run this test')
 @skipIf(os.environ.get("TRAVIS", None) == 'true', "Skip testing of entire FreeSolv database on Travis.")
+@skipIf(os.environ.get("JENKINS_URL", None) is not None, "Skip testing of entire FreeSolv database on Jenkins.")
 def test_load_freesolv_gaffmol2_vs_sybylmol2_vs_obabelpdb():
     with utils.enter_temp_directory():