diff --git a/.travis.yml b/.travis.yml
index 64f7337..03f5f4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,11 @@ deploy:
   distributions: sdist bdist_wheel
   password:
     secure: VH1rgFV5XD0k3cMZxJwetBnETrFolBaM0U4K9CKQts38LF7f4xA8muY2FFFyeqR7VF2MQhYgGMcaAQQx/gRY+7AdSnqMYvxZ7p3P81aF7ruE3KjXgV6oPkTX4LkUlZf+co1rGs59TJ4UDJQM73+9EiYD3MJ/G0KeyMnAak73HkRHWdypOGLrINLPyUuuUAxQ8k4UJWskEMXjMgKIlGdCcdbCWqso/lZqvQ+/bFfv5M+yhQK57JMlXfXsM3YMxUGY7IhYRhxHL3nCpxXacut2FBU6H1GCU8MuR2bJ/aNNdl8elNzCEZcRq8+s94yrI095HQvVW/tLWaNJ4ojZSsGhmzvC/xAB+VbCp7ZvI0vHPGEOQgR/bIkDa9uhuwCWtfM81VCPpBrXgwupgznxtsjFcmBSUOpTFLTW5dKoPDWOe5K4wHKd9IKbWwk+mAY+aczV4T0uMX/eKhEOWJS03cjIPN4qwdCy6zSnBWpJBoLR7QyYZKNL1MiyQ0toUsJO0ln6vaPTXOo0K7EJIxKVOYf3xR8kNsgWWe0Z4orSt56O8+v5OIYbDcSeY1hwklcMvQdGHlLyMx01D2v346mL532MHA24nRmXfDUz0ixx5rn7g4Tykvy2LBLYfrfhV4G6kvimTk5Y6I7Rif4y68+r+NHmBlZwUju0AsK0a+s5/XAg5Nc=
-  provider: pypi
-  user: hydrosquall
+#  provider: pypi
+#  user: hydrosquall
 
 install:
+  - tools/install_pandas.sh
   - python setup.py develop
   - pip install -U pytest-cov codecov vcrpy
   # - pip install -U tox-travis pytest
@@ -22,6 +23,10 @@ python:
   - 2.7
   # - 2.6
 
+env:
+  - WITH_PANDAS=false
+  - WITH_PANDAS=true
+
 script:
   - export TIINGO_API_KEY=0000000000000000000000000000000000000000
   - py.test --cov=./tiingo
diff --git a/tests/test_tiingo_pandas.py b/tests/test_tiingo_pandas.py
index 76d415f..c9a5f97 100644
--- a/tests/test_tiingo_pandas.py
+++ b/tests/test_tiingo_pandas.py
@@ -4,7 +4,7 @@
 import vcr
 from unittest import TestCase
 from tiingo import TiingoClient
-from tiingo.api import APIColumnNameError
+from tiingo.api import APIColumnNameError, InstallPandasException
 try:
     import pandas as pd
     pandas_is_installed = True
@@ -55,3 +55,17 @@ class TestTiingoWithPython(TestCase):
         prices = self._client.get_dataframe("GOOGL")
         assert len(prices) == 1
         assert len(prices.index) == 1
+
+
+class TestTiingoWithoutPython(TestCase):
+
+    def setUp(self):
+        if pandas_is_installed:
+            self.skipTest("test_tiingo_without_pandas: Pandas not installed.")
+        else:
+            self._client = TiingoClient()
+
+    @vcr.use_cassette('tests/fixtures/ticker_price_pandas_single.yaml')
+    def test_get_dataframe_without_pandas(self):
+        with self.assertRaises(InstallPandasException):
+            self._client.get_dataframe("GOOGL")
diff --git a/tools/install_pandas.sh b/tools/install_pandas.sh
new file mode 100755
index 0000000..98ca923
--- /dev/null
+++ b/tools/install_pandas.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+if $WITH_PANDAS
+then
+    pip install pandas
+    echo "pandas installed"
+fi