diff --git a/setup.py b/setup.py
index c9d24852..90aae695 100644
--- a/setup.py
+++ b/setup.py
@@ -120,7 +120,7 @@ def run(self):
       test_suite= "test.alltests",
       # https://pythonhosted.org/setuptools/setuptools.html
       # prep_test requires ctypeslib2
-      # tests_require=["volatility", "ctypeslib2>2.1.3"],
+      #tests_require=["volatility"],
       # tests_require=["ctypeslib2>2.1.3"],
       #entry_points = {'haystack.plugins':['haystack.model:register']},
       cmdclass={
diff --git a/test/haystack/mappings/test_vol.py b/test/haystack/mappings/test_vol.py
index f55d8325..025f8cf0 100644
--- a/test/haystack/mappings/test_vol.py
+++ b/test/haystack/mappings/test_vol.py
@@ -6,7 +6,10 @@
 import logging
 import unittest
 
-from haystack.mappings.vol import VolatilityProcessMapper
+try:
+    from haystack.mappings.vol import VolatilityProcessMapper
+except ImportError,e:
+    unittest.skip('Volatility not installed')
 
 from test.testfiles import zeus_1668_vmtoolsd_exe
 from test.testfiles import zeus_856_svchost_exe