diff --git a/pyfa.py b/pyfa.py
index b27389971..f5aab70a3 100755
--- a/pyfa.py
+++ b/pyfa.py
@@ -94,6 +94,7 @@ if not hasattr(sys, 'frozen'):
 
     # check also for dateutil module installed.
     try:
+        # noinspection PyPackageRequirements
         import dateutil.parser  # noqa - Copied import statement from service/update.py
     except ImportError:
         print("Cannot find python-dateutil.\nYou can download python-dateutil from https://pypi.python.org/pypi/python-dateutil")
@@ -120,6 +121,7 @@ if __name__ == "__main__":
     logging.basicConfig()
 
     # Import everything
+    # noinspection PyPackageRequirements
     import wx
     import os
     import os.path
diff --git a/service/character.py b/service/character.py
index 25333edd6..f1d1cf5f8 100644
--- a/service/character.py
+++ b/service/character.py
@@ -27,6 +27,7 @@ from xml.etree import ElementTree
 from xml.dom import minidom
 import gzip
 
+# noinspection PyPackageRequirements
 import wx
 
 import config
diff --git a/service/crest.py b/service/crest.py
index 6ce59040e..e672e3df6 100644
--- a/service/crest.py
+++ b/service/crest.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 import thread
 import logging
diff --git a/service/market.py b/service/market.py
index 902b06fe6..074e9618a 100644
--- a/service/market.py
+++ b/service/market.py
@@ -22,6 +22,7 @@ import threading
 import logging
 import Queue
 
+# noinspection PyPackageRequirements
 import wx
 from sqlalchemy.sql import or_
 
diff --git a/service/port.py b/service/port.py
index 2cfcff05c..fd347db4f 100644
--- a/service/port.py
+++ b/service/port.py
@@ -33,6 +33,7 @@ import xml.parsers.expat
 from eos import db
 from service.fit import Fit as svcFit
 
+# noinspection PyPackageRequirements
 import wx
 
 from eos.saveddata.cargo import Cargo
diff --git a/service/server.py b/service/server.py
index 268637515..5a2bdb564 100644
--- a/service/server.py
+++ b/service/server.py
@@ -4,6 +4,7 @@ import socket
 import thread
 import logging
 
+# noinspection PyPackageRequirements
 import wx
 
 from service.settings import CRESTSettings
diff --git a/service/update.py b/service/update.py
index 2c09910d7..6ca8a61a8 100644
--- a/service/update.py
+++ b/service/update.py
@@ -21,7 +21,9 @@ import threading
 import json
 import calendar
 
+# noinspection PyPackageRequirements
 import wx
+# noinspection PyPackageRequirements
 import dateutil.parser
 
 import config
diff --git a/setup.py b/setup.py
index b4738824a..35f87fb62 100644
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,7 @@ excludes = ['Tkinter', 'collections.abc', 'IPython', 'PyQt4', 'PIL', 'nose', 'to
 
 if __name__ == "__main__":
     import sys
+    # noinspection PyPackageRequirements
     from cx_Freeze import setup, Executable
     import config
 
diff --git a/tests/test_package.py b/tests/test_package.py
index 19299a942..2788e4509 100644
--- a/tests/test_package.py
+++ b/tests/test_package.py
@@ -4,6 +4,7 @@ import os
 import sys
 import importlib
 
+# noinspection PyPackageRequirements
 import pytest