diff --git a/setup.py b/setup.py
index fa68616..9700ec8 100644
--- a/setup.py
+++ b/setup.py
@@ -4,11 +4,12 @@ import os.path
 
 from setuptools import find_packages, setup
 
-here = os.path.abspath(os.path.dirname(__file__))
+BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+VERSION_FILE = os.path.join(BASE_DIR, 'stix2', 'version.py')
 
 
 def get_version():
-    with open('stix2/version.py', encoding="utf-8") as f:
+    with open(VERSION_FILE) as f:
         for line in f.readlines():
             if line.startswith("__version__"):
                 version = line.split()[-1].strip('"')
@@ -16,7 +17,7 @@ def get_version():
         raise AttributeError("Package does not have a __version__")
 
 
-with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
+with open('README.rst') as f:
     long_description = f.read()
 
 
@@ -52,6 +53,8 @@ setup(
         'simplejson',
         'six',
         'stix2-patterns',
-        'taxii2-client',
     ],
+    extras_require={
+        'taxii': ['taxii2-client']
+    }
 )
diff --git a/tox.ini b/tox.ini
index bfc8c1b..ed26bc0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,7 @@ deps =
     pytest
     pytest-cov
     coverage
+    taxii2-client
 commands =
     py.test --cov=stix2 stix2/test/ --cov-report term-missing