diff --git a/.gitignore b/.gitignore
index 90bbd3043f..13a3046a1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,9 @@ develop-eggs
 lib64
 virtualenv
 virtualenv-py3
+virtualenv-osx
+virtualenv-st2client
+virtualenv-st2client-osx
 
 # Installer logs
 pip-log.txt
diff --git a/.travis.yml b/.travis.yml
index 9e67239e88..e4912a9e2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,7 +82,7 @@ before_install:
   - echo "deb [arch=amd64] http://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.4 multiverse" | sudo tee -a /etc/apt/sources.list
   # Work around for Travis timeout issues, see https://github.com/travis-ci/travis-ci/issues/9112
   - sudo apt-get update --option Acquire::Retries=100 --option Acquire::http::Timeout="60"
-  - sudo apt-get install mongodb-org-server mongodb-org-shell git -y
+  - sudo apt-get install mongodb-org-server mongodb-org-shell git libffi-dev -y
   - pip install --upgrade "pip>=9.0,<9.1"
   - sudo pip install --upgrade "virtualenv==15.1.0"
 
diff --git a/Makefile b/Makefile
index 1d625e880f..6bf98a16bb 100644
--- a/Makefile
+++ b/Makefile
@@ -256,7 +256,8 @@ flake8: requirements .flake8
 	touch $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate
 	chmod +x $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate
 
-	$(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; python setup.py install
+	$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip>=9.0,<9.1"
+	$(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_DIR)/bin/python setup.py install ; cd ..
 	$(VIRTUALENV_ST2CLIENT_DIR)/bin/st2 --version
 	$(VIRTUALENV_ST2CLIENT_DIR)/bin/python -c "import st2client"
 
@@ -819,7 +820,7 @@ debs:
 ci: ci-checks ci-unit ci-integration ci-mistral ci-packs-tests
 
 .PHONY: ci-checks
-ci-checks: compile .generated-files-check .pylint .flake8 .bandit .st2client-dependencies-check .st2common-circular-dependencies-check circle-lint-api-spec .rst-check
+ci-checks: compile .generated-files-check .pylint .flake8 .bandit .st2client-dependencies-check .st2common-circular-dependencies-check circle-lint-api-spec .rst-check .st2client-install-check
 
 .PHONY: ci-py3-unit
 ci-py3-unit:
diff --git a/st2client/in-requirements.txt b/st2client/in-requirements.txt
index 1bcf2d0b7a..7e1f3f3c23 100644
--- a/st2client/in-requirements.txt
+++ b/st2client/in-requirements.txt
@@ -11,3 +11,4 @@ six
 sseclient
 python-editor
 prompt-toolkit
+cryptography
diff --git a/st2client/requirements.txt b/st2client/requirements.txt
index fec0a83097..cdcc42b4a6 100644
--- a/st2client/requirements.txt
+++ b/st2client/requirements.txt
@@ -1,5 +1,6 @@
 # Don't edit this file. It's generated automatically!
 argcomplete
+cryptography==2.3.1
 jsonpath-rw==1.4.0
 jsonschema==2.6.0
 prettytable