diff --git a/defaults/main.yml b/defaults/main.yml
index c071a7a8..0dfe7dcb 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -46,8 +46,6 @@ neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
 neutron_vpnaas_git_install_branch: master
 neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing
 neutron_dynamic_routing_git_install_branch: master
-calico_git_repo: https://github.com/projectcalico/felix
-calico_git_install_branch: master
 networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
 networking_calico_git_install_branch: master
 dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow
diff --git a/tasks/providers/calico_config.yml b/tasks/providers/calico_config.yml
index f0ea0a31..a6d397da 100644
--- a/tasks/providers/calico_config.yml
+++ b/tasks/providers/calico_config.yml
@@ -36,6 +36,23 @@
     - calico-install
     - calico-pip-packages
 
+- name: Install Calico Felix agent
+  get_url:
+    url: "{{ calico_felix_url }}"
+    dest: "{{ calico_felix_bin }}"
+    sha256sum: "{{ calico_felix_sha256 }}"
+    validate_certs: "{{ calico_felix_validate_certs }}"
+    mode: '0755'
+  register: install_packages
+  until: install_packages|success
+  retries: 5
+  delay: 2
+  when:
+    - "neutron_services['calico-felix']['group'] in group_names"
+  notify: Restart neutron services
+  tags:
+    - calico-install
+
 - name: Ensure calico config directory exists
   file:
     path: "/etc/calico"
@@ -46,4 +63,4 @@
   when:
     - neutron_services['calico-felix']['group'] in group_names
   tags:
-    - calico-felix-config
+    - calico-config
diff --git a/tests/neutron-overrides-calico.yml b/tests/neutron-overrides-calico.yml
index cbb9209e..22f261da 100644
--- a/tests/neutron-overrides-calico.yml
+++ b/tests/neutron-overrides-calico.yml
@@ -23,6 +23,11 @@ tempest_plugins:
 tempest_test_whitelist:
   - neutron.tests.tempest.api.test_networks*
 
+tempest_private_net_provider_type: "local"
+tempest_private_net_seg_id: ''
+tempest_public_net_provider_type: "local"
+tempest_public_net_physical_type: ''
+
 neutron_plugin_type: ml2.calico
 neutron_provider_networks:
   network_types: ''
diff --git a/tests/test-calico-functional.yml b/tests/test-calico-functional.yml
index c496993a..3df346bb 100644
--- a/tests/test-calico-functional.yml
+++ b/tests/test-calico-functional.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 - name: Test calico
-  hosts: neutron_all
+  hosts: neutron_calico_dhcp_agent
   user: root
   gather_facts: true
   tasks:
@@ -24,14 +24,17 @@
         - calico-felix
         - calico-dhcp-age
     - name: Ensure that the Calico Felix agent is alive
-      shell: |
-        . /root/openrc
-        neutron agent-list | grep calico-felix
+      command: openstack --os-cloud default network agent list -f json
       register: calico_felix_agent
-      until: calico_felix_agent.stdout.find(':-)') != -1
-      when:
-        - groups['neutron_calico_dhcp_agent'] | length > 0
+      until: |-
+        ansible_nodename in (calico_felix_agent.stdout
+                            | from_json
+                            | selectattr('Binary', 'equalto', 'calico-felix')
+                            | map(attribute='Host') | list)
       retries: 5
       delay: 10
+      with_items: "{{ ansible_play_hosts }}"
+      delegate_to: "{{ groups['utility_all'][0] }}"
+      run_once: yes
   vars_files:
     - common/test-vars.yml
diff --git a/vars/main.yml b/vars/main.yml
index 4e2759cc..c60b0c46 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -40,6 +40,13 @@ neutron_package_list: |-
   {% endif %}
   {{ packages }}
 
+# Set the Calico Felix agent URL information
+calico_felix_url: "https://github.com/projectcalico/felix/releases/download/{{ calico_felix_version }}/calico-felix"
+calico_felix_version: 2.3.0
+calico_felix_sha256: 6cc538d6d93d2b5e732841769f427ce61a4e7d9a6eedf4ca8d33c4df42cf6419
+calico_felix_bin: /usr/local/bin/calico-felix
+calico_felix_validate_certs: yes
+
 ###
 ### Python code details
 ###
@@ -68,7 +75,6 @@ neutron_optional_bgp_pip_packages:
   - neutron_dynamic_routing
 
 neutron_optional_calico_pip_packages:
-  - felix
   - networking-calico
   - python-etcd
 
@@ -96,7 +102,6 @@ neutron_developer_constraints:
   - "git+{{ neutron_lbaas_git_repo }}@{{ neutron_lbaas_git_install_branch }}#egg=neutron-lbaas"
   - "git+{{ neutron_vpnaas_git_repo }}@{{ neutron_vpnaas_git_install_branch }}#egg=neutron-vpnaas"
   - "git+{{ neutron_dynamic_routing_git_repo }}@{{ neutron_dynamic_routing_git_install_branch }}#egg=neutron-dynamic-routing"
-  - "git+{{ calico_git_repo }}@{{ calico_git_install_branch }}#egg=felix"
   - "git+{{ networking_calico_git_repo }}@{{ networking_calico_git_install_branch }}#egg=networking-calico"
   - "git+{{ dragonflow_git_repo }}@{{ dragonflow_git_install_branch }}#egg=dragonflow"
 
@@ -449,6 +454,7 @@ neutron_services:
    group: neutron_calico_dhcp_agent
    system_user: root
    system_group: root
+   program_override: "{{ calico_felix_bin }}"
    service_name: calico-felix
    service_en: "{{ neutron_plugin_type == 'ml2.calico' }}"
    service_conf_path: /etc/calico