diff --git a/bin/setup_and_test.sh b/bin/setup_and_test.sh
index 8758977..db05a25 100755
--- a/bin/setup_and_test.sh
+++ b/bin/setup_and_test.sh
@@ -7,10 +7,18 @@ export PIP_DOWNLOAD_CACHE=~/.pip_cache
 
 WD=`pwd`
 POSTGRES_PORT=${POSTGRES_PORT:=5432}
+CACHE_DIR=~/.cache
 
 
 echo "Downloading CKAN..."
-git clone https://github.com/ckan/ckan
+if [ ! -d "$CACHE_DIR/ckan" ]
+then
+    git clone https://github.com/ckan/ckan "$CACHE_DIR/ckan"
+fi
+ln -s "$CACHE_DIR/ckan" .
+cd ckan
+git checkout release-v2.2
+cd $WD
 
 
 echo "Checking Solr..."
@@ -20,12 +28,11 @@ if [ $SOLR_ACTIVE -ne 0 ]
 then
     
     echo "Downloading Solr..."
-    CACHE_DIR=~/.cache
     FILE=solr-4.8.1.zip
     SOLAR_UNZIP_FOLDER=solr-4.8.1
 
     # If the solar folder does not exist, we have to build it
-    if [ ! -f "$CACHE_DIR/$SOLAR_UNZIP_FOLDER" ]
+    if [ ! -d "$CACHE_DIR/$SOLAR_UNZIP_FOLDER" ]
     then
         # Download the solar installation file if it does not exist
         if [ ! -f "$CACHE_DIR/$FILE" ]
@@ -49,7 +56,6 @@ else
     echo "Solar is already installed..."
 fi
 
-
 echo "Setting up virtualenv..."
 virtualenv --no-site-packages virtualenv
 source virtualenv/bin/activate