diff --git a/snapcraft/tests/fake_servers/snapd.py b/snapcraft/tests/fake_servers/snapd.py
index 1c27126..71e849f 100644
--- a/snapcraft/tests/fake_servers/snapd.py
+++ b/snapcraft/tests/fake_servers/snapd.py
@@ -13,12 +13,14 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 import json
-from http.server import BaseHTTPRequestHandler
 from urllib import parse
 
+from snapcraft.tests import fake_servers
+
 
-class FakeSnapdRequestHandler(BaseHTTPRequestHandler):
+class FakeSnapdRequestHandler(fake_servers.BaseHTTPRequestHandler):
 
     snaps_result = []
     snap_details_func = None