diff --git a/contrib/terraform/openstack/README.md b/contrib/terraform/openstack/README.md
index a8760d96278a312d6a241b8407bcf0f9dafd6d34..2f185518a1a87b83d8d03bb952de4c2c69799485 100644
--- a/contrib/terraform/openstack/README.md
+++ b/contrib/terraform/openstack/README.md
@@ -36,7 +36,7 @@ Ensure your OpenStack credentials are loaded in environment variables. This can
 $ source ~/.stackrc
 ```
 
-You will need two networks before installing, an internal network and 
+You will need two networks before installing, an internal network and
 an external (floating IP Pool) network. The internet network can be shared as
 we use security groups to provide network segregation. Due to the many
 differences between OpenStack installs the Terraform does not attempt to create
@@ -97,7 +97,7 @@ gfs_volume_size_in_gb = "50"
 ssh_user_gfs = "ubuntu"
 ```
 
-If these variables are provided, this will give rise to a new ansible group called `gfs-cluster`, for which we have added ansible roles to execute in the ansible provisioning step. If you are using CoreOS, these GlusterFS VM necessarily need to be either Debian or RedHat based VMs, CoreOS cannot serve GlusterFS, but can connect to it through binaries available on hyperkube v1.4.3_coreos.0 or higher.
+If these variables are provided, this will give rise to a new ansible group called `gfs-cluster`, for which we have added ansible roles to execute in the ansible provisioning step. If you are using Container Linux by CoreOS, these GlusterFS VM necessarily need to be either Debian or RedHat based VMs, Container Linux by CoreOS cannot serve GlusterFS, but can connect to it through binaries available on hyperkube v1.4.3_coreos.0 or higher.
 
 
 # Provision a Kubernetes Cluster on OpenStack
@@ -133,20 +133,20 @@ Make sure you can connect to the hosts:
 ```
 $ ansible -i contrib/terraform/openstack/hosts -m ping all
 example-k8s_node-1 | SUCCESS => {
-    "changed": false, 
+    "changed": false,
     "ping": "pong"
 }
 example-etcd-1 | SUCCESS => {
-    "changed": false, 
+    "changed": false,
     "ping": "pong"
 }
 example-k8s-master-1 | SUCCESS => {
-    "changed": false, 
+    "changed": false,
     "ping": "pong"
 }
 ```
 
-if you are deploying a system that needs bootstrapping, like CoreOS, these might have a state `FAILED` due to CoreOS not having python. As long as the state is not `UNREACHABLE`, this is fine.
+if you are deploying a system that needs bootstrapping, like Container Linux by CoreOS, these might have a state `FAILED` due to Container Linux by CoreOS not having python. As long as the state is not `UNREACHABLE`, this is fine.
 
 if it fails try to connect manually via SSH ... it could be somthing as simple as a stale host key.
 
diff --git a/contrib/terraform/openstack/group_vars/all.yml b/contrib/terraform/openstack/group_vars/all.yml
index f64cab5aa94a37533a04440e2fd9a04168087eac..f49292c3f0a1b219495f0d0c9d7eb328deff342b 100644
--- a/contrib/terraform/openstack/group_vars/all.yml
+++ b/contrib/terraform/openstack/group_vars/all.yml
@@ -10,7 +10,7 @@ local_release_dir: "/tmp/releases"
 # Random shifts for retrying failed ops like pushing/downloading
 retry_stagger: 5
 
-# Uncomment this line for CoreOS only.
+# Uncomment this line for Container Linux by CoreOS only.
 # Directory where python binary is installed
 # ansible_python_interpreter: "/opt/bin/python"
 
diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml
index c8bc2c3bb2f4a68bb74dc9cd57e4c45cbc3530ac..360cc1bf22f5cabb0b9576809d877b5259097bef 100644
--- a/roles/docker/handlers/main.yml
+++ b/roles/docker/handlers/main.yml
@@ -15,7 +15,7 @@
   service:
     name: docker.socket
     state: restarted
-  when: ansible_os_family == 'CoreOS'
+  when: ansible_os_family == 'Container Linux by CoreOS'
 
 - name: Docker | reload docker
   service:
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 69243a612c7a998fd307c5c6f9011f8a47426977..4d7fe573ec3f59e0402657f57d243243ac59d204 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -20,7 +20,7 @@
           docker requires a minimum kernel version of
           {{ docker_kernel_min_version }} on
           {{ ansible_distribution }}-{{ ansible_distribution_version }}
-  when: (ansible_os_family != "CoreOS") and (ansible_kernel|version_compare(docker_kernel_min_version, "<"))
+  when: (ansible_os_family != "Container Linux by CoreOS") and (ansible_kernel|version_compare(docker_kernel_min_version, "<"))
   tags: facts
 
 - name: ensure docker repository public key is installed
@@ -34,7 +34,7 @@
   retries: 4
   delay: "{{ retry_stagger | random + 3 }}"
   with_items: "{{ docker_repo_key_info.repo_keys }}"
-  when: ansible_os_family != "CoreOS"
+  when: ansible_os_family != "Container Linux by CoreOS"
 
 - name: ensure docker repository is enabled
   action: "{{ docker_repo_info.pkg_repo }}"
@@ -42,7 +42,7 @@
     repo: "{{item}}"
     state: present
   with_items: "{{ docker_repo_info.repos }}"
-  when: (ansible_os_family != "CoreOS") and (docker_repo_info.repos|length > 0)
+  when: (ansible_os_family != "Container Linux by CoreOS") and (docker_repo_info.repos|length > 0)
 
 - name: Configure docker repository on RedHat/CentOS
   copy:
@@ -61,7 +61,7 @@
   retries: 4
   delay: "{{ retry_stagger | random + 3 }}"
   with_items: "{{ docker_package_info.pkgs }}"
-  when: (ansible_os_family != "CoreOS") and (docker_package_info.pkgs|length > 0)
+  when: (ansible_os_family != "Container Linux by CoreOS") and (docker_package_info.pkgs|length > 0)
 
 - name: Set docker systemd config
   include: systemd.yml
diff --git a/roles/docker/tasks/systemd.yml b/roles/docker/tasks/systemd.yml
index e998979a600c95fe4d7baa9661a6541dd71dfcae..5eb6e63e89602027f98b6ce318bfff0de8113211 100644
--- a/roles/docker/tasks/systemd.yml
+++ b/roles/docker/tasks/systemd.yml
@@ -13,7 +13,7 @@
     src: docker.service.j2
     dest: /etc/systemd/system/docker.service
   register: docker_service_file
-  when: ansible_os_family != "CoreOS"
+  when: ansible_os_family != "Container Linux by CoreOS"
 
 - name: Write docker options systemd drop-in
   template:
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 77933bfb63456cff6a5d524a7f49121eee62ecac..463658d42bc93e8026222066b584252928e9506b 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -2,14 +2,14 @@
 local_release_dir: /tmp
 
 # if this is set to true will only download files once. Doesn't work
-# on CoreOS unless the download_localhost is true and localhost
+# on Container Linux by CoreOS unless the download_localhost is true and localhost
 # is running another OS type. Default compress level is 9 (best).
 download_run_once: False
 download_compress: 9
 
 # if this is set to true, uses the localhost for download_run_once mode
 # (requires docker and sudo to access docker). You may want this option for
-# local caching of docker images or for CoreOS cluster nodes.
+# local caching of docker images or for Container Linux by CoreOS cluster nodes.
 # Otherwise, uses the first node in the kube-master group to store images
 # in the download_run_once mode.
 download_localhost: False
diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml
index 7ac38449d8bf7f1d75aa8178e0d40f1f7d276c5f..158d262f31a8c0d282f17bf0ca49b5a8b3e5a876 100644
--- a/roles/download/tasks/main.yml
+++ b/roles/download/tasks/main.yml
@@ -48,7 +48,7 @@
   when: "{{ download.enabled|bool and download.container|bool }}"
   tags: bootstrap-os
 
-# This is required for the download_localhost delegate to work smooth with CoreOS cluster nodes
+# This is required for the download_localhost delegate to work smooth with Container Linux by CoreOS cluster nodes
 - name: Hack python binary path for localhost
   raw: sh -c "mkdir -p /opt/bin; ln -sf /usr/bin/python /opt/bin/python"
   when: "{{ download_delegate == 'localhost' }}"
@@ -119,7 +119,7 @@
   delegate_to: "{{ download_delegate }}"
   register: saved
   run_once: true
-  when: (ansible_os_family != "CoreOS" or download_delegate == "localhost") and download_run_once|bool and download.enabled|bool and download.container|bool and (container_changed|bool or not img.stat.exists)
+  when: (ansible_os_family != "Container Linux by CoreOS" or download_delegate == "localhost") and download_run_once|bool and download.enabled|bool and download.container|bool and (container_changed|bool or not img.stat.exists)
 
 - name: Download | copy container images to ansible host
   synchronize:
@@ -128,7 +128,7 @@
     mode: pull
   delegate_to: localhost
   become: false
-  when: ansible_os_family != "CoreOS" and inventory_hostname == groups['kube-master'][0] and download_delegate != "localhost" and download_run_once|bool and download.enabled|bool and download.container|bool and saved.changed
+  when: ansible_os_family != "Container Linux by CoreOS" and inventory_hostname == groups['kube-master'][0] and download_delegate != "localhost" and download_run_once|bool and download.enabled|bool and download.container|bool and saved.changed
 
 - name: Download | upload container images to nodes
   synchronize:
@@ -141,10 +141,10 @@
   until: get_task|success
   retries: 4
   delay: "{{ retry_stagger | random + 3 }}"
-  when: (ansible_os_family != "CoreOS" and inventory_hostname != groups['kube-master'][0] or download_delegate == "localhost") and download_run_once|bool and download.enabled|bool and download.container|bool
+  when: (ansible_os_family != "Container Linux by CoreOS" and inventory_hostname != groups['kube-master'][0] or download_delegate == "localhost") and download_run_once|bool and download.enabled|bool and download.container|bool
   tags: [upload, upgrade]
 
 - name: Download | load container images
   shell: "{{ docker_bin_dir }}/docker load < {{ fname }}"
-  when: (ansible_os_family != "CoreOS" and inventory_hostname != groups['kube-master'][0] or download_delegate == "localhost") and download_run_once|bool and download.enabled|bool and download.container|bool
+  when: (ansible_os_family != "Container Linux by CoreOS" and inventory_hostname != groups['kube-master'][0] or download_delegate == "localhost") and download_run_once|bool and download.enabled|bool and download.container|bool
   tags: [upload, upgrade]
diff --git a/roles/etcd/meta/main.yml b/roles/etcd/meta/main.yml
index 744eb9fe2306d5f17b2e9e0bcb2383e75d205361..ad580afdd87799807a5a9a6e1fc9393c4eff9847 100644
--- a/roles/etcd/meta/main.yml
+++ b/roles/etcd/meta/main.yml
@@ -2,7 +2,7 @@
 dependencies:
   - role: adduser
     user: "{{ addusers.etcd }}"
-    when: ansible_os_family != 'CoreOS'
+    when: ansible_os_family != 'Container Linux by CoreOS'
   - role: download
     file: "{{ downloads.etcd }}"
     tags: download
diff --git a/roles/etcd/tasks/gen_certs.yml b/roles/etcd/tasks/gen_certs.yml
index 3dcec8499a0bf4bd767b271de157acee1404fef4..8807fb626cec95f6b9c381f852db8fc5daf6f062 100644
--- a/roles/etcd/tasks/gen_certs.yml
+++ b/roles/etcd/tasks/gen_certs.yml
@@ -129,7 +129,7 @@
       /usr/local/share/ca-certificates/etcd-ca.crt
       {%- elif ansible_os_family == "RedHat" -%}
       /etc/pki/ca-trust/source/anchors/etcd-ca.crt
-      {%- elif ansible_os_family == "CoreOS" -%}
+      {%- elif ansible_os_family == "Container Linux by CoreOS" -%}
       /etc/ssl/certs/etcd-ca.pem
       {%- endif %}
   tags: facts
@@ -141,9 +141,9 @@
     remote_src: true
   register: etcd_ca_cert
 
-- name: Gen_certs | update ca-certificates (Debian/Ubuntu/CoreOS)
+- name: Gen_certs | update ca-certificates (Debian/Ubuntu/Container Linux by CoreOS)
   command: update-ca-certificates
-  when: etcd_ca_cert.changed and ansible_os_family in ["Debian", "CoreOS"]
+  when: etcd_ca_cert.changed and ansible_os_family in ["Debian", "Container Linux by CoreOS"]
 
 - name: Gen_certs | update ca-certificates (RedHat)
   command: update-ca-trust extract
diff --git a/roles/kubernetes/preinstall/defaults/main.yml b/roles/kubernetes/preinstall/defaults/main.yml
index 35ad8abeaf9da9fe277aec37f87831fadc3a807d..1515c93ce08e5b0a4fcad73d7e60e1c6787ee6e1 100644
--- a/roles/kubernetes/preinstall/defaults/main.yml
+++ b/roles/kubernetes/preinstall/defaults/main.yml
@@ -29,6 +29,6 @@ openstack_tenant_id: "{{ lookup('env','OS_TENANT_ID')  }}"
 # All clients access each node individually, instead of using a load balancer.
 etcd_multiaccess: true
 
-# CoreOS cloud init config file to define /etc/resolv.conf content
+# Container Linux by CoreOS cloud init config file to define /etc/resolv.conf content
 # for hostnet pods and infra needs
 resolveconf_cloud_init_conf: /etc/resolveconf_cloud_init.conf
diff --git a/roles/kubernetes/preinstall/handlers/main.yml b/roles/kubernetes/preinstall/handlers/main.yml
index 81d690bb63905aae260f6eaea7d52a99c1a78066..19a9770f3a3d684338b4ed63340066436a99b4f0 100644
--- a/roles/kubernetes/preinstall/handlers/main.yml
+++ b/roles/kubernetes/preinstall/handlers/main.yml
@@ -3,7 +3,7 @@
   notify:
     - Preinstall | reload network
     - Preinstall | reload kubelet
-  when: ansible_os_family != "CoreOS"
+  when: ansible_os_family != "Container Linux by CoreOS"
 
   # FIXME(bogdando) https://github.com/projectcalico/felix/issues/1185
 - name: Preinstall | reload network
@@ -15,18 +15,18 @@
       networking
       {%- endif %}
     state: restarted
-  when: ansible_os_family != "CoreOS" and kube_network_plugin not in ['canal', 'calico']
+  when: ansible_os_family != "Container Linux by CoreOS" and kube_network_plugin not in ['canal', 'calico']
 
-- name: Preinstall | update resolvconf for CoreOS
+- name: Preinstall | update resolvconf for Container Linux by CoreOS
   command: /bin/true
   notify:
     - Preinstall | apply resolvconf cloud-init
     - Preinstall | reload kubelet
-  when: ansible_os_family == "CoreOS"
+  when: ansible_os_family == "Container Linux by CoreOS"
 
 - name: Preinstall | apply resolvconf cloud-init
   command: /usr/bin/coreos-cloudinit --from-file {{ resolveconf_cloud_init_conf }}
-  when: ansible_os_family == "CoreOS"
+  when: ansible_os_family == "Container Linux by CoreOS"
 
 - name: Preinstall | reload kubelet
   service:
diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
index 761d497b01c9fea0f2091e1ee299db2418f00021..cab3f7b0cdd172f487a927dae61b02a03f2520da 100644
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@@ -2,10 +2,10 @@
 - include: pre-upgrade.yml
   tags: [upgrade,  bootstrap-os]
 
-- name: Force binaries directory for CoreOS
+- name: Force binaries directory for Container Linux by CoreOS
   set_fact:
     bin_dir: "/opt/bin"
-  when: ansible_os_family == "CoreOS"
+  when: ansible_os_family == "Container Linux by CoreOS"
   tags: facts
 
 - name: check bin dir exists
@@ -131,7 +131,7 @@
   retries: 4
   delay: "{{ retry_stagger | random + 3 }}"
   with_items: "{{required_pkgs | default([]) | union(common_required_pkgs|default([]))}}"
-  when: ansible_os_family != "CoreOS"
+  when: ansible_os_family != "Container Linux by CoreOS"
   tags: bootstrap-os
 
 - name: Disable IPv6 DNS lookup
@@ -140,7 +140,7 @@
     line: "precedence ::ffff:0:0/96  100"
     state: present
     backup: yes
-  when: disable_ipv6_dns and ansible_os_family != "CoreOS"
+  when: disable_ipv6_dns and ansible_os_family != "Container Linux by CoreOS"
   tags: bootstrap-os
 
 # Todo : selinux configuration
diff --git a/roles/kubernetes/preinstall/tasks/pre-upgrade.yml b/roles/kubernetes/preinstall/tasks/pre-upgrade.yml
index ebe3a8f3573217efbc193a65703dcc017a5adb0e..73ffa3a62e544da47a6af8a74778a174bb4bdda6 100644
--- a/roles/kubernetes/preinstall/tasks/pre-upgrade.yml
+++ b/roles/kubernetes/preinstall/tasks/pre-upgrade.yml
@@ -2,3 +2,7 @@
 - name: Stop if non systemd OS type
   assert:
     that: ansible_service_mgr == "systemd"
+
+- name: Stop if obsolete CoreOS family fact value
+  assert:
+    that: ansible_os_family != "CoreOS"
diff --git a/roles/kubernetes/preinstall/tasks/resolvconf.yml b/roles/kubernetes/preinstall/tasks/resolvconf.yml
index faf3fc67157bb269804410876de7183aba7c4dd6..a58d3eb99158a9cae2a7ad9c6683000a559be485 100644
--- a/roles/kubernetes/preinstall/tasks/resolvconf.yml
+++ b/roles/kubernetes/preinstall/tasks/resolvconf.yml
@@ -1,7 +1,7 @@
 ---
 - name: create temporary resolveconf cloud init file
   command: cp -f /etc/resolv.conf "{{ resolvconffile }}"
-  when: ansible_os_family == "CoreOS"
+  when: ansible_os_family == "Container Linux by CoreOS"
 
 - name: Remove search/domain/nameserver options
   lineinfile:
@@ -48,7 +48,7 @@
 - name: get temporary resolveconf cloud init file content
   command: cat {{ resolvconffile }}
   register: cloud_config
-  when: ansible_os_family == "CoreOS"
+  when: ansible_os_family == "Container Linux by CoreOS"
 
 - name: persist resolvconf cloud init file
   template:
@@ -56,9 +56,9 @@
     src: resolvconf.j2
     owner: root
     mode: 0644
-  notify: Preinstall | update resolvconf for CoreOS
-  when: ansible_os_family == "CoreOS"
+  notify: Preinstall | update resolvconf for Container Linux by CoreOS
+  when: ansible_os_family == "Container Linux by CoreOS"
 
 - include: dhclient-hooks.yml
-  when: ansible_os_family != "CoreOS"
+  when: ansible_os_family != "Container Linux by CoreOS"
   tags: [bootstrap-os, resolvconf]
diff --git a/roles/kubernetes/preinstall/tasks/set_resolv_facts.yml b/roles/kubernetes/preinstall/tasks/set_resolv_facts.yml
index 726cfdb53e93edf2fb1e098de4bc54fb75f19969..165ff76684f2cc1e2ac699697396f2fe08773174 100644
--- a/roles/kubernetes/preinstall/tasks/set_resolv_facts.yml
+++ b/roles/kubernetes/preinstall/tasks/set_resolv_facts.yml
@@ -35,11 +35,11 @@
       {%- if resolvconf|bool -%}/etc/resolvconf/resolv.conf.d/base{%- endif -%}
     head: >-
       {%- if resolvconf|bool -%}/etc/resolvconf/resolv.conf.d/head{%- endif -%}
-  when: ansible_os_family != "CoreOS"
+  when: ansible_os_family != "Container Linux by CoreOS"
 
-- name: target temporary resolvconf cloud init file (CoreOS)
+- name: target temporary resolvconf cloud init file (Container Linux by CoreOS)
   set_fact: resolvconffile=/tmp/resolveconf_cloud_init_conf
-  when: ansible_os_family == "CoreOS"
+  when: ansible_os_family == "Container Linux by CoreOS"
 
 - name: target dhclient conf/hook files for Red Hat family
   set_fact:
diff --git a/roles/kubernetes/secrets/tasks/gen_certs.yml b/roles/kubernetes/secrets/tasks/gen_certs.yml
index 6a841911fc9547cdc2135869a49e164374d2f87b..da2ad6bcdd25f2c66a4804cd8eec0ecdd63e1839 100644
--- a/roles/kubernetes/secrets/tasks/gen_certs.yml
+++ b/roles/kubernetes/secrets/tasks/gen_certs.yml
@@ -74,7 +74,7 @@
       /usr/local/share/ca-certificates/kube-ca.crt
       {%- elif ansible_os_family == "RedHat" -%}
       /etc/pki/ca-trust/source/anchors/kube-ca.crt
-      {%- elif ansible_os_family == "CoreOS" -%}
+      {%- elif ansible_os_family == "Container Linux by CoreOS" -%}
       /etc/ssl/certs/kube-ca.pem
       {%- endif %}
   tags: facts
@@ -86,9 +86,9 @@
     remote_src: true
   register: kube_ca_cert
 
-- name: Gen_certs | update ca-certificates (Debian/Ubuntu/CoreOS)
+- name: Gen_certs | update ca-certificates (Debian/Ubuntu/Container Linux by CoreOS)
   command: update-ca-certificates
-  when: kube_ca_cert.changed and ansible_os_family in ["Debian", "CoreOS"]
+  when: kube_ca_cert.changed and ansible_os_family in ["Debian", "Container Linux by CoreOS"]
 
 - name: Gen_certs | update ca-certificates (RedHat)
   command: update-ca-trust extract
diff --git a/roles/network_plugin/calico/rr/meta/main.yml b/roles/network_plugin/calico/rr/meta/main.yml
index ef7986901af25ee76b0f67671069112472f92532..3721d8672714cb7a1ad434bb3e6fd233f9c95083 100644
--- a/roles/network_plugin/calico/rr/meta/main.yml
+++ b/roles/network_plugin/calico/rr/meta/main.yml
@@ -1,6 +1,6 @@
 dependencies:
   - role: etcd
   - role: docker
-    when: ansible_os_family != "CoreOS"
+    when: ansible_os_family != "Container Linux by CoreOS"
   - role: download
     file: "{{ downloads.calico_rr }}"
diff --git a/roles/network_plugin/flannel/handlers/main.yml b/roles/network_plugin/flannel/handlers/main.yml
index b2a66f43f72479b3161b0d2b8e5fa51ba21cf378..8f265276c6dfba7d483e4693965c6726d4b39c03 100644
--- a/roles/network_plugin/flannel/handlers/main.yml
+++ b/roles/network_plugin/flannel/handlers/main.yml
@@ -20,7 +20,7 @@
   service:
     name: docker.socket
     state: restarted
-  when: ansible_os_family == 'CoreOS'
+  when: ansible_os_family == 'Container Linux by CoreOS'
 
 - name: Flannel | reload docker
   service:
diff --git a/roles/network_plugin/flannel/templates/flannel-options.conf.j2 b/roles/network_plugin/flannel/templates/flannel-options.conf.j2
index e7758736c59056087c65454b29e685404a474967..df3862e38df227cb06038812991f882eaced6461 100644
--- a/roles/network_plugin/flannel/templates/flannel-options.conf.j2
+++ b/roles/network_plugin/flannel/templates/flannel-options.conf.j2
@@ -1,5 +1,5 @@
 [Service]
-{% if ansible_os_family == "CoreOS" %}
+{% if ansible_os_family == "Container Linux by CoreOS" %}
 Environment="DOCKER_OPT_BIP=--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }}"
 {% else %}
 Environment="DOCKER_NETWORK_OPTIONS=--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }}"
diff --git a/tests/testcases/020_check-create-pod.yml b/tests/testcases/020_check-create-pod.yml
index 828d8bf7da65dbdedaffc5670641d008ea95eaa2..d874374ea24f4c899673984f7c97721d01def28c 100644
--- a/tests/testcases/020_check-create-pod.yml
+++ b/tests/testcases/020_check-create-pod.yml
@@ -7,14 +7,14 @@
 
   tasks:
 
-  - name: Force binaries directory for CoreOS
+  - name: Force binaries directory for Container Linux by CoreOS
     set_fact:
       bin_dir: "/opt/bin"
-    when: ansible_os_family == "CoreOS"
+    when: ansible_os_family == "Container Linux by CoreOS"
 
   - set_fact:
       bin_dir: "/usr/local/bin"
-    when: ansible_os_family != "CoreOS"
+    when: ansible_os_family != "Container Linux by CoreOS"
 
   - name: Run a replica controller composed of 2 pods
     shell: "{{bin_dir}}/kubectl run test --image={{test_image_repo}}:{{test_image_tag}} --replicas=2 --command -- tail -f /dev/null"
diff --git a/tests/testcases/030_check-network.yml b/tests/testcases/030_check-network.yml
index abe2f7a8140f8537d5945e5a57ce38b019f62e7d..30b9c05437fb939d14c7467e856d4e3dc0f7e413 100644
--- a/tests/testcases/030_check-network.yml
+++ b/tests/testcases/030_check-network.yml
@@ -3,14 +3,14 @@
 
   tasks:
 
-  - name: Force binaries directory for CoreOS
+  - name: Force binaries directory for Container Linux by CoreOS
     set_fact:
       bin_dir: "/opt/bin"
-    when: ansible_os_family == "CoreOS"
+    when: ansible_os_family == "Container Linux by CoreOS"
 
   - set_fact:
       bin_dir: "/usr/local/bin"
-    when: ansible_os_family != "CoreOS"
+    when: ansible_os_family != "Container Linux by CoreOS"
 
   - name: Get pod names
     shell: "{{bin_dir}}/kubectl get pods -o json"
diff --git a/tests/testcases/040_check-network-adv.yml b/tests/testcases/040_check-network-adv.yml
index 1e2540cb9c78e9f77178072695cb19c2ff8d360c..f32facb45eb2096f5635442d1aa576617ea58a56 100644
--- a/tests/testcases/040_check-network-adv.yml
+++ b/tests/testcases/040_check-network-adv.yml
@@ -12,14 +12,14 @@
     netchecker_port: 31081
 
   tasks:
-    - name: Force binaries directory for CoreOS
+    - name: Force binaries directory for Container Linux by CoreOS
       set_fact:
         bin_dir: "/opt/bin"
-      when: ansible_os_family == "CoreOS"
+      when: ansible_os_family == "Container Linux by CoreOS"
 
     - set_fact:
         bin_dir: "/usr/local/bin"
-      when: ansible_os_family != "CoreOS"
+      when: ansible_os_family != "Container Linux by CoreOS"
 
     - name: Wait for netchecker server
       shell: "{{ bin_dir }}/kubectl get pods --namespace {{netcheck_namespace}} | grep ^netchecker-server"