diff --git a/iozone-fsync/iozone.py b/iozone-fsync/iozone.py
index 63a8c3a..9358033 100644
--- a/iozone-fsync/iozone.py
+++ b/iozone-fsync/iozone.py
@@ -28,10 +28,14 @@ class iozone(test.test):
         series = platform.dist()[2]
 
         pkgs = [
-            'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs', 'btrfs-tools',
+            'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs',
         ]
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib'
         pkgs.append(gcc)
+        if series in ['precise', 'trusty', 'xenial']:
+            pkgs.append('btrfs-tools')
+        else:
+            pkgs.append('btrfs-progs')
 
         cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)
diff --git a/iozone-nolazy/iozone.py b/iozone-nolazy/iozone.py
index 63a8c3a..9358033 100644
--- a/iozone-nolazy/iozone.py
+++ b/iozone-nolazy/iozone.py
@@ -28,10 +28,14 @@ class iozone(test.test):
         series = platform.dist()[2]
 
         pkgs = [
-            'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs', 'btrfs-tools',
+            'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs',
         ]
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib'
         pkgs.append(gcc)
+        if series in ['precise', 'trusty', 'xenial']:
+            pkgs.append('btrfs-tools')
+        else:
+            pkgs.append('btrfs-progs')
 
         cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)
diff --git a/iozone/iozone.py b/iozone/iozone.py
index 63a8c3a..9358033 100644
--- a/iozone/iozone.py
+++ b/iozone/iozone.py
@@ -28,10 +28,14 @@ class iozone(test.test):
         series = platform.dist()[2]
 
         pkgs = [
-            'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs', 'btrfs-tools',
+            'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs',
         ]
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib'
         pkgs.append(gcc)
+        if series in ['precise', 'trusty', 'xenial']:
+            pkgs.append('btrfs-tools')
+        else:
+            pkgs.append('btrfs-progs')
 
         cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)
diff --git a/tiobench/tiobench.py b/tiobench/tiobench.py
index e700027..9340a69 100644
--- a/tiobench/tiobench.py
+++ b/tiobench/tiobench.py
@@ -12,10 +12,14 @@ class tiobench(test.test):
         series = platform.dist()[2]
 
         pkgs = [
-            'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs', 'btrfs-tools',
+            'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs',
         ]
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib'
         pkgs.append(gcc)
+        if series in ['precise', 'trusty', 'xenial']:
+            pkgs.append('btrfs-tools')
+        else:
+            pkgs.append('btrfs-progs')
 
         cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)
diff --git a/ubuntu_btrfs_kernel_fixes/ubuntu_btrfs_kernel_fixes.py b/ubuntu_btrfs_kernel_fixes/ubuntu_btrfs_kernel_fixes.py
index 6765382..41cd50e 100644
--- a/ubuntu_btrfs_kernel_fixes/ubuntu_btrfs_kernel_fixes.py
+++ b/ubuntu_btrfs_kernel_fixes/ubuntu_btrfs_kernel_fixes.py
@@ -33,10 +33,14 @@ class ubuntu_btrfs_kernel_fixes(test.test):
         series = platform.dist()[2]
 
         pkgs = [
-            'build-essential', 'xfsprogs', 'btrfs-tools', 'git', 'acl', 'libattr1-dev',
+            'build-essential', 'xfsprogs', 'git', 'acl', 'libattr1-dev',
         ]
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib'
         pkgs.append(gcc)
+        if series in ['precise', 'trusty', 'xenial']:
+            pkgs.append('btrfs-tools')
+        else:
+            pkgs.append('btrfs-progs')
 
         if self.which('sysbench') is None:
             pkgs.append('sysbench')
diff --git a/ubuntu_ecryptfs/ubuntu_ecryptfs.py b/ubuntu_ecryptfs/ubuntu_ecryptfs.py
index 4e193ea..e8dcd76 100644
--- a/ubuntu_ecryptfs/ubuntu_ecryptfs.py
+++ b/ubuntu_ecryptfs/ubuntu_ecryptfs.py
@@ -11,10 +11,14 @@ class ubuntu_ecryptfs(test.test):
         series = platform.dist()[2]
 
         pkgs = [
-            'bzr', 'build-essential', 'libglib2.0-dev', 'intltool', 'keyutils', 'libkeyutils-dev', 'libpam0g-dev', 'libnss3-dev', 'libtool', 'acl', 'xfsprogs', 'btrfs-tools', 'libattr1-dev'
+            'bzr', 'build-essential', 'libglib2.0-dev', 'intltool', 'keyutils', 'libkeyutils-dev', 'libpam0g-dev', 'libnss3-dev', 'libtool', 'acl', 'xfsprogs', 'libattr1-dev'
         ]
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib'
         pkgs.append(gcc)
+        if series in ['precise', 'trusty', 'xenial']:
+            pkgs.append('btrfs-tools')
+        else:
+            pkgs.append('btrfs-progs')
 
         cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)
diff --git a/ubuntu_generic_fstest/ubuntu_generic_fstest.py b/ubuntu_generic_fstest/ubuntu_generic_fstest.py
index 33dd83b..f9dae1e 100644
--- a/ubuntu_generic_fstest/ubuntu_generic_fstest.py
+++ b/ubuntu_generic_fstest/ubuntu_generic_fstest.py
@@ -4,6 +4,7 @@ import os
 import glob
 from autotest.client                        import test, utils
 import multiprocessing
+import platform
 from autotest.client.shared import error
 
 class ubuntu_generic_fstest(test.test):
@@ -17,10 +18,15 @@ class ubuntu_generic_fstest(test.test):
     # if you change setup, be sure to increment version
     #
     def setup(self):
+        series = platform.dist()[2]
         self.job.require_gcc()
         utils.system_output('rm -f /etc/*/S99autotest || true', retain_output=True)
 
-        pkgs = [ 'btrfs-tools', 'xfsprogs', 'jfsutils' ]
+        pkgs = [ 'xfsprogs', 'jfsutils' ]
+        if series in ['precise', 'trusty', 'xenial']:
+            pkgs.append('btrfs-tools')
+        else:
+            pkgs.append('btrfs-progs')
         for pkg in pkgs:
             print "Installing package " + pkg
             utils.system_output('apt-get install ' + pkg + ' --yes --force-yes ', retain_output=True)
diff --git a/ubuntu_stress_btrfs/ubuntu_stress_btrfs.py b/ubuntu_stress_btrfs/ubuntu_stress_btrfs.py
index 5b1b74d..fb626fe 100644
--- a/ubuntu_stress_btrfs/ubuntu_stress_btrfs.py
+++ b/ubuntu_stress_btrfs/ubuntu_stress_btrfs.py
@@ -13,10 +13,14 @@ class ubuntu_stress_btrfs(test.test):
         series = platform.dist()[2]
 
         pkgs = [
-            'build-essential', 'xfsprogs', 'btrfs-tools', 'git', 'acl', 'libattr1-dev', 'libkeyutils-dev',
+            'build-essential', 'xfsprogs', 'git', 'acl', 'libattr1-dev', 'libkeyutils-dev',
         ]
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib'
         pkgs.append(gcc)
+        if series in ['precise', 'trusty', 'xenial']:
+            pkgs.append('btrfs-tools')
+        else:
+            pkgs.append('btrfs-progs')
 
         cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)
diff --git a/ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py b/ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py
index 76615a0..e63b3c7 100644
--- a/ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py
+++ b/ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py
@@ -13,10 +13,14 @@ class ubuntu_stress_btrfs_cmd(test.test):
         series = platform.dist()[2]
 
         pkgs = [
-            'build-essential', 'xfsprogs', 'btrfs-tools', 'git', 'acl', 'libattr1-dev',
+            'build-essential', 'xfsprogs', 'git', 'acl', 'libattr1-dev',
         ]
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib'
         pkgs.append(gcc)
+        if series in ['precise', 'trusty', 'xenial']:
+            pkgs.append('btrfs-tools')
+        else:
+            pkgs.append('btrfs-progs')
 
         cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)
diff --git a/xfstests/xfstests.py b/xfstests/xfstests.py
index 1f4bfab..5be0f9c 100644
--- a/xfstests/xfstests.py
+++ b/xfstests/xfstests.py
@@ -37,7 +37,6 @@ class xfstests(test.test):
             'python-xattr',
             'quota',
             'bc',
-            'btrfs-tools',
             'attr',
             'texinfo',
             'texlive',
@@ -56,6 +55,10 @@ class xfstests(test.test):
 
         if series not in ['precise', 'trusty']:
             pkgs.append('libtool-bin')
+        if series in ['precise', 'trusty', 'xenial']:
+            pkgs.append('btrfs-tools')
+        else:
+            pkgs.append('btrfs-progs')
 
         cmd = 'apt-get install --yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)
