diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index ac972cfb223..a57cea74b46 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -360,7 +360,7 @@ class RuntimeTestContext(TestContext):
                     for line in f:
                         (pkg, arch, version) = line.strip().split()
                         self.pkgmanifest[pkg] = (version, arch)
-            except IOError as e:
+            except OSError as e:
                 bb.fatal("No package manifest file found. Did you build the image?\n%s" % e)
 
     def _get_test_namespace(self):
diff --git a/meta/lib/oeqa/selftest/cases/manifest.py b/meta/lib/oeqa/selftest/cases/manifest.py
index bbb92c17409..2c103c06fe3 100644
--- a/meta/lib/oeqa/selftest/cases/manifest.py
+++ b/meta/lib/oeqa/selftest/cases/manifest.py
@@ -94,7 +94,7 @@ class VerifyManifest(OESelftestTestCase):
                 if not os.path.isfile(mpath[k]):
                     self.logger.debug("{}: {} does not exist".format(
                         self.classname, mpath[k]))
-                    raise IOError
+                    raise OSError
                 m_entry[k] = ManifestEntry(mpath[k])
 
                 pkgdata_dir[k] = self.get_dir_from_bb_var('PKGDATA_DIR',
@@ -104,11 +104,11 @@ class VerifyManifest(OESelftestTestCase):
                 if not os.path.exists(reverse_dir[k]):
                     self.logger.debug("{}: {} does not exist".format(
                         self.classname, reverse_dir[k]))
-                    raise IOError
+                    raise OSError
         except OSError:
             raise self.skipTest("{}: Error in obtaining manifest dirs"\
                 .format(self.classname))
-        except IOError:
+        except OSError:
             msg = "{}: Error cannot find manifests in the specified dir:\n{}"\
                     .format(self.classname, mdir)
             self.fail(msg)
@@ -137,18 +137,18 @@ class VerifyManifest(OESelftestTestCase):
             mfilename = get_bb_var("IMAGE_LINK_NAME", self.buildtarget)\
                     + ".manifest"
             mpath = os.path.join(mdir, mfilename)
-            if not os.path.isfile(mpath): raise IOError
+            if not os.path.isfile(mpath): raise OSError
             m_entry = ManifestEntry(mpath)
 
             pkgdata_dir = {}
             pkgdata_dir = self.get_dir_from_bb_var('PKGDATA_DIR',
                                                 self.buildtarget)
             revdir = os.path.join(pkgdata_dir, 'runtime-reverse')
-            if not os.path.exists(revdir): raise IOError
+            if not os.path.exists(revdir): raise OSError
         except OSError:
             raise self.skipTest("{}: Error in obtaining manifest dirs"\
                 .format(self.classname))
-        except IOError:
+        except OSError:
             msg = "{}: Error cannot find manifests in dir:\n{}"\
                     .format(self.classname, mdir)
             self.fail(msg)
diff --git a/meta/lib/oeqa/utils/ftools.py b/meta/lib/oeqa/utils/ftools.py
index a50aaa84c29..3a10ae79d45 100644
--- a/meta/lib/oeqa/utils/ftools.py
+++ b/meta/lib/oeqa/utils/ftools.py
@@ -36,7 +36,7 @@ def remove_from_file(path, data):
         return
     try:
         rdata = read_file(path)
-    except IOError as e:
+    except OSError as e:
         # if file does not exit, just quit, otherwise raise an exception
         if e.errno == errno.ENOENT:
             return
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index dada3166187..26782518e4e 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -119,7 +119,7 @@ class QemuRunner:
             self.logger.debug("Created listening socket for qemu serial console on: 127.0.0.1:%s" % port)
             return (sock, port)
 
-        except socket.error:
+        except OSError:
             sock.close()
             raise
 
@@ -216,7 +216,7 @@ class QemuRunner:
             if self.serial_ports >= 2:
                 self.threadsock, threadport = self.create_socket()
             self.server_socket, self.serverport = self.create_socket()
-        except socket.error as msg:
+        except OSError as msg:
             self.logger.error("Failed to create listening socket: %s" % msg[1])
             return False
 
@@ -858,7 +858,7 @@ class LoggingThread(threading.Thread):
     def recv(self, count, sock):
         try:
             data = sock.recv(count)
-        except socket.error as e:
+        except OSError as e:
             if e.errno == errno.EAGAIN or e.errno == errno.EWOULDBLOCK:
                 return b''
             else:
diff --git a/meta/lib/oeqa/utils/qemutinyrunner.py b/meta/lib/oeqa/utils/qemutinyrunner.py
index d1ccf65223f..d4a42304e23 100644
--- a/meta/lib/oeqa/utils/qemutinyrunner.py
+++ b/meta/lib/oeqa/utils/qemutinyrunner.py
@@ -55,7 +55,7 @@ class QemuTinyRunner(QemuRunner):
                 self.server_socket.connect(self.socketfile)
                 bb.note("Created listening socket for qemu serial console.")
                 tries = 0
-            except socket.error as msg:
+            except OSError as msg:
                 self.server_socket.close()
                 bb.fatal("Failed to create listening socket.")
                 tries -= 1