diff --git a/.travis.yml b/.travis.yml
index 0e99375..d60440a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ env:
   matrix:
     - ROS_DISTRO="kinetic"
     - ROS_DISTRO="melodic"
+    - ROS_DISTRO="noetic"
 install:
   - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .industrial_ci
 script:
diff --git a/test/mjpg_server.py b/test/mjpg_server.py
index db374ec..573dcd3 100755
--- a/test/mjpg_server.py
+++ b/test/mjpg_server.py
@@ -9,7 +9,10 @@
 import rospy
 import sys
 import time
-from BaseHTTPServer import BaseHTTPRequestHandler
+if sys.version_info[0] < 3:
+    from BaseHTTPServer import BaseHTTPRequestHandler
+else:
+    from http.server import BaseHTTPRequestHandler
 from BaseHTTPServer import HTTPServer
 from SocketServer import ThreadingMixIn