diff --git a/tests/Vagrantfile b/tests/Vagrantfile
index a76a443..1cea031 100644
--- a/tests/Vagrantfile
+++ b/tests/Vagrantfile
@@ -10,62 +10,15 @@ Vagrant.configure(2) do |config|
   # For a complete reference, please see the online documentation at
   # https://docs.vagrantup.com.
 
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "juniper/ffp-12.1X47-D15.4-packetmode"
+  config.vm.define "vsrx" do |vsrx|
+      vsrx.vm.hostname = "vsrx"
+      vsrx.vm.box = "juniper/ffp-12.1X47-D15.4-packetmode"
+  end
 
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = true
-  #
-  #   # Customize the amount of memory on the VM:
-  #   vb.memory = "1024"
-  # end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  # config.vm.provision "shell", inline: <<-SHELL
-  #   sudo apt-get update
-  #   sudo apt-get install -y apache2
-  # SHELL
+  config.vm.provision "ansible" do |ansible|
+      ansible.groups = {
+          "all" => ["vsrx"]
+      }
+      ansible.playbook = "junos_get_facts/pb.junos_get_facts.yaml"
+  end
 end
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
new file mode 100644
index 0000000..2127be7
--- /dev/null
+++ b/tests/ansible.cfg
@@ -0,0 +1,5 @@
+
+[defaults]
+hash_behaviour=merge
+inventory = .vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory
+roles_path = ../../
diff --git a/tests/junos_get_facts/pb.junos_get_facts.yaml b/tests/junos_get_facts/pb.junos_get_facts.yaml
new file mode 100644
index 0000000..c5cdc19
--- /dev/null
+++ b/tests/junos_get_facts/pb.junos_get_facts.yaml
@@ -0,0 +1,26 @@
+---
+- name: Test junos_get_facts module
+  hosts: all
+  connection: local
+  gather_facts: no
+  vars:
+    ansible_python_interpreter: /usr/local/bin/python
+  roles:
+    - Juniper.junos
+  tasks:
+    - name: "TEST 1 - Gather Facts"
+      junos_get_facts:
+        host: "{{ ansible_ssh_host }}"
+        port: "{{ ansible_ssh_port }}"
+        user: root
+        passwd: Juniper
+      ignore_errors: True
+      register: test1
+
+#    - debug: var=test1
+
+    - name: Check TEST 1
+      assert:
+        that:
+          - test1.facts.hostname == 'vsrx'
+          - test1.facts.virtual == true
diff --git a/tests/junos_ping/pb.junos_ping.yaml b/tests/junos_ping/pb.junos_ping.yaml
new file mode 100644
index 0000000..ecf32b5
--- /dev/null
+++ b/tests/junos_ping/pb.junos_ping.yaml
@@ -0,0 +1,61 @@
+---
+- name: Test junos_ping module
+  hosts: all
+  connection: local
+  gather_facts: no
+  vars:
+    ansible_python_interpreter: /usr/local/bin/python
+  roles:
+    - Juniper.junos
+  tasks:
+    - name: "TEST 1 - Ping Google DNS"
+      junos_ping:
+        host: "{{ ansible_ssh_host }}"
+        port: "{{ ansible_ssh_port }}"
+        user: root
+        passwd: Juniper
+        dest_ip: 8.8.8.8
+      register: test1
+      ignore_errors: True
+#    - debug: var=test1
+
+    - name: Check TEST 1
+      assert:
+        that:
+          - test1.packet_loss == '0'
+
+############
+
+    - name: "TEST 2 - Ping Wrong IP"
+      junos_ping:
+        host: "{{ ansible_ssh_host }}"
+        port: "{{ ansible_ssh_port }}"
+        user: root
+        passwd: Juniper
+        dest_ip: 8.8.1.1
+      register: test2
+      ignore_errors: True
+#    - debug: var=test2
+
+    - name: Check TEST 2
+      assert:
+        that:
+          - test2.packet_loss == '100'
+#################
+
+    - name: "TEST 3 - Change nbr packets"
+      junos_ping:
+        host: "{{ ansible_ssh_host }}"
+        port: "{{ ansible_ssh_port }}"
+        user: root
+        passwd: Juniper
+        dest_ip: 8.8.8.8
+        count: 3
+      register: test3
+      ignore_errors: True
+#    - debug: var=test3
+
+    - name: Check TEST 3
+      assert:
+        that:
+          - test3.packets_sent == '3'