diff --git a/.gitignore b/.gitignore
index 652d40dfc69c1f9c047a9ccb12700e1b15323fd9..7dc4ee63b4088a8f29d1a263a39c71f3e49db3fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 results*
 *.json
 *.log
+tools/android-sdk-linux
diff --git a/Vagrantfile b/Vagrantfile
index 8ccd4647876cf3e7d4db7330e654c5224573b4f6..77cb5eb56b5cea067de1980c5c303c1480e9d877 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,6 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+
 Vagrant.configure(2) do |config|
   config.vm.box = "ubuntu/trusty64"
 
@@ -14,13 +15,52 @@ Vagrant.configure(2) do |config|
 
   config.vm.provision "shell", inline: <<-SHELL
     sudo apt-get update
-    sudo apt-get install -y autoconf automake build-essential git libfreetype6-dev libpng12-dev libtool nmap pkg-config python-all-dev python-matplotlib python-nose python-numpy python-pip python-zmq sshpass trace-cmd tree
+    sudo apt-get install -y autoconf automake build-essential expect git \
+        libfreetype6-dev libpng12-dev libtool nmap openjdk-7-jdk \
+        openjdk-7-jre pkg-config python-all-dev python-matplotlib \
+        python-nose python-numpy python-pip python-zmq sshpass trace-cmd \
+        tree wget
     sudo pip install ipython[notebook] pandas
     sudo apt-get remove -y w3m
 
     ln -s /vagrant /home/vagrant/lisa
+
+    cd /home/vagrant/lisa
+    ANDROID_SDK_URL="https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz"
+    if [ ! -e ./tools/android-sdk-linux ]; then
+        echo "Downloading Android SDK [$ANDROID_SDK_URL]..."
+        wget -qO- $ANDROID_SDK_URL | tar xz -C tools
+        expect -c '
+            set timeout -1;
+            spawn ./tools/android-sdk-linux/tools/android update sdk --no-ui \
+                -t tool,platform-tool,platform;
+            expect {
+                "Do you accept the license" { exp_send "y\r" ; exp_continue }
+                eof
+            }
+        '
+    fi
+
     chown vagrant.vagrant /home/vagrant/lisa
     echo cd /home/vagrant/lisa >> /home/vagrant/.bashrc
+    for LC in $(locale | cut -d= -f1);
+    do
+        echo unset $LC  >> /home/vagrant/.bashrc
+    done
+    echo "export ANDROID_HOME=/vagrant/tools/android-sdk-linux" >> /home/vagrant/.bashrc
+    echo "export PATH=$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$PATH" >> /home/vagrant/.bashrc
     echo source init_env >> /home/vagrant/.bashrc
+
+    echo "Virtual Machine Installation completed successfully!                "
+    echo "                                                                    "
+    echo "You can now access and use the virtual machine by running:          "
+    echo "                                                                    "
+    echo "    $ vagrant ssh                                                   "
+    echo "                                                                    "
+    echo "NOTE: if you exit, the virtual machine is still running. To shut it "
+    echo "      down, please run:                                             "
+    echo "                                                                    "
+    echo "    $ vagrant suspend                                               "
+    echo "                                                                    "
   SHELL
 end