diff --git a/generic/stress-ng.py b/generic/stress-ng.py
index 97951e41b..196c9d0c9 100644
--- a/generic/stress-ng.py
+++ b/generic/stress-ng.py
@@ -66,7 +66,7 @@ def setUp(self):
         if detected_distro.name in ['Ubuntu', 'debian']:
             deps.extend([
                 'libaio-dev', 'libapparmor-dev', 'libattr1-dev', 'libbsd-dev',
-                'libcap-dev', 'libgcrypt11-dev', 'libkeyutils-dev',
+                'libcap-dev', 'libgcrypt20-dev', 'libkeyutils-dev',
                 'libsctp-dev', 'zlib1g-dev'])
         else:
             deps.extend(['libattr-devel', 'libcap-devel',
diff --git a/io/disk/fiotest.py b/io/disk/fiotest.py
index 821848edf..2525a855c 100755
--- a/io/disk/fiotest.py
+++ b/io/disk/fiotest.py
@@ -60,7 +60,6 @@ def setUp(self):
         self.sourcedir = os.path.join(self.teststmpdir, "fio")
         build.make(self.sourcedir)
 
-        pkg_list = ['libaio', 'libaio-devel']
         smm = SoftwareManager()
         if fstype == 'btrfs':
             ver = int(distro.detect().version)
@@ -69,8 +68,13 @@ def setUp(self):
                 if (ver == 7 and rel >= 4) or ver > 7:
                     self.cancel("btrfs is not supported with \
                                 RHEL 7.4 onwards")
-            if distro.detect().name == 'Ubuntu':
-                pkg_list.append('btrfs-tools')
+
+        if distro.detect().name in ['Ubuntu', 'debian']:
+            pkg_list = ['libaio-dev']
+            if fstype == 'btrfs':
+                pkg_list.append('btrfs-progs')
+        else:
+            pkg_list = ['libaio', 'libaio-devel']
 
         for pkg in pkg_list:
             if pkg and not smm.check_installed(pkg) and not smm.install(pkg):
diff --git a/io/disk/lvsetup.py b/io/disk/lvsetup.py
index 157e5823d..2b9b1bdef 100755
--- a/io/disk/lvsetup.py
+++ b/io/disk/lvsetup.py
@@ -48,14 +48,14 @@ def setUp(self):
         """
         Check existence of input PV,VG, LV and snapshots prior to Test.
         """
-        pkg = ""
+        pkgs = [""]
         smm = SoftwareManager()
         self.disk = self.params.get('lv_disks', default=None)
         self.vg_name = self.params.get('vg_name', default='avocado_vg')
         self.lv_name = self.params.get('lv_name', default='avocado_lv')
         self.fs_name = self.params.get('fs', default='ext4').lower()
         if self.fs_name == 'xfs':
-            pkg = 'xfsprogs'
+            pkgs = ['xfsprogs']
         if self.fs_name == 'btrfs':
             ver = int(distro.detect().version)
             rel = int(distro.detect().release)
@@ -63,11 +63,15 @@ def setUp(self):
                 if (ver == 7 and rel >= 4) or ver > 7:
                     self.cancel("btrfs is not supported with RHEL 7.4 onwards")
             if distro.detect().name == 'SuSE':
-                pkg = 'btrfsprogs'
+                pkgs = ['btrfsprogs']
             else:
-                pkg = 'btrfs-progs'
-        if pkg and not smm.check_installed(pkg) and not smm.install(pkg):
-            self.cancel("Package %s could not be installed" % pkg)
+                pkgs = ['btrfs-progs']
+        if distro.detect().name in ['Ubuntu', 'debian']:
+            pkgs.extend(['lvm2'])
+
+        for pkg in pkgs:
+            if pkg and not smm.check_installed(pkg) and not smm.install(pkg):
+                self.cancel("Package %s could not be installed" % pkg)
 
         self.lv_snap_name = self.params.get(
             'lv_snapshot_name', default='avocado_sn')
diff --git a/perf/perfmon.py b/perf/perfmon.py
index aba53e378..6d3826ab4 100644
--- a/perf/perfmon.py
+++ b/perf/perfmon.py
@@ -19,7 +19,7 @@
 
 from avocado import Test
 from avocado import main
-from avocado.utils import process, build, git
+from avocado.utils import process, build, git, distro
 from avocado.utils.software_manager import SoftwareManager
 
 
@@ -34,8 +34,13 @@ def setUp(self):
 
         # Check for basic utilities
         smm = SoftwareManager()
+        dist = distro.detect()
 
-        for package in ("gcc", "make"):
+        deps = ["gcc", "make"]
+        if dist.name in ['Ubuntu', 'debian']:
+            deps.extend(['libncurses-dev'])
+
+        for package in deps:
             if not smm.check_installed(package) and not smm.install(package):
                 self.cancel(
                     "Fail to install %s required for this test." % package)
diff --git a/toolchain/valgrind.py b/toolchain/valgrind.py
index b271b5b86..6baa20ae8 100755
--- a/toolchain/valgrind.py
+++ b/toolchain/valgrind.py
@@ -73,7 +73,7 @@ def get_results(self, cmd):
             self.sourcedir, extra_args=cmd,
             process_kwargs={'ignore_status': True}).stdout
         for line in results.splitlines():
-            if line.startswith('==') and line.endswith('=='):
+            if line.startswith(b'==') and line.endswith(b'=='):
                 flag = True
             if flag:
                 summary += '%s\n' % line