diff --git a/qa/distros/supported/ubuntu_14.04.yaml b/qa/distros/supported/ubuntu_14.04.yaml
deleted file mode 120000
index cf7fff7a866..00000000000
--- a/qa/distros/supported/ubuntu_14.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../all/ubuntu_14.04.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/libcephfs_java.yaml b/qa/suites/fs/basic_functional/tasks/libcephfs_java/libcephfs_java.yaml
similarity index 80%
rename from qa/suites/fs/basic_functional/tasks/libcephfs_java.yaml
rename to qa/suites/fs/basic_functional/tasks/libcephfs_java/libcephfs_java.yaml
index aaffa033811..6c5d874400e 100644
--- a/qa/suites/fs/basic_functional/tasks/libcephfs_java.yaml
+++ b/qa/suites/fs/basic_functional/tasks/libcephfs_java/libcephfs_java.yaml
@@ -1,7 +1,3 @@
-
-os_type: ubuntu
-os_version: "14.04"
-
 overrides:
   ceph-fuse:
     disabled: true
diff --git a/qa/suites/fs/basic_functional/tasks/libcephfs_java/ubuntu_latest.yaml b/qa/suites/fs/basic_functional/tasks/libcephfs_java/ubuntu_latest.yaml
new file mode 120000
index 00000000000..cc5b15bccc7
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/libcephfs_java/ubuntu_latest.yaml
@@ -0,0 +1 @@
+../../../../../distros/supported/ubuntu_latest.yaml
\ No newline at end of file