diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 660f11129bc7ad661faf9a0d3022aa7bee24988a..853c586e002abeaacd331a67e82a4557fa3aa97b 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -336,13 +336,17 @@ if $INSTALL_NEO4J_SPATIAL; then
 	cd $DEPLOY_DIR/neo4j-spatial
 	git checkout -q $NEO4J_SPATIAL_VERSION  > /dev/null 2>&1
 
-	if $IMPORT_DATA; then
-		# We need to compile the source when importing data, so that the main class gets compiled
-		mvn clean install -DskipTests > $WORKING_DIR/install_neo4j_spatial.log 2>&1
-		unzip -o $DEPLOY_DIR/neo4j-spatial/target/*server-plugin.zip -d $DEPLOY_DIR/$TOMCAT_PKG_NAME/webapps/geoserver/WEB-INF/lib > $WORKING_DIR/install_neo4j_spatial_plugin.log 2>&1
-	else
-		download_newer $DOWNLOAD_DIR/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip http://dist.neo4j.org.s3.amazonaws.com/spatial/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip
-		unzip -o $DOWNLOAD_DIR/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip -d $DEPLOY_DIR/$TOMCAT_PKG_NAME/webapps/geoserver/WEB-INF/lib > $WORKING_DIR/install_neo4j_spatial_plugin.log 2>&1
+	if $INSTALL_GEOSERVER; then
+		if $IMPORT_DATA; then
+			# We need to compile the source when importing data, so that the main class gets compiled
+			echo "Installing neo4-spatial into geoserver from source"
+			mvn clean install -DskipTests > $WORKING_DIR/install_neo4j_spatial.log 2>&1
+			unzip -o $DEPLOY_DIR/neo4j-spatial/target/*server-plugin.zip -d $DEPLOY_DIR/$TOMCAT_PKG_NAME/webapps/geoserver/WEB-INF/lib > $WORKING_DIR/install_neo4j_spatial_plugin.log 2>&1
+		else
+			echo "Installing neo4-spatial into geoserver from binary"
+			download_newer $DOWNLOAD_DIR/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip http://dist.neo4j.org.s3.amazonaws.com/spatial/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip
+			unzip -o $DOWNLOAD_DIR/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip -d $DEPLOY_DIR/$TOMCAT_PKG_NAME/webapps/geoserver/WEB-INF/lib > $WORKING_DIR/install_neo4j_spatial_plugin.log 2>&1
+		fi
 	fi
 	cd $WORKING_DIR
 fi