diff --git a/common/djangoapps/pipeline_mako/__init__.py b/common/djangoapps/pipeline_mako/__init__.py
index 04d5dd34ea..8f7b94c322 100644
--- a/common/djangoapps/pipeline_mako/__init__.py
+++ b/common/djangoapps/pipeline_mako/__init__.py
@@ -140,6 +140,6 @@ def render_require_js_path_overrides(path_overrides):
         # RequireJS also already has a base URL set to the base static URL, so we can remove that.
         path = actual_url.replace('.js', '').replace(django_settings.STATIC_URL, '')
 
-        new_paths.append("'{module}': '{path}'".format(module=module, path=path))
+        new_paths.append(f"'{module}': '{path}'")
 
     return html.format(overrides=',\n'.join(new_paths))
diff --git a/common/djangoapps/pipeline_mako/tests/test_render.py b/common/djangoapps/pipeline_mako/tests/test_render.py
index 2f1f193af9..046522f810 100644
--- a/common/djangoapps/pipeline_mako/tests/test_render.py
+++ b/common/djangoapps/pipeline_mako/tests/test_render.py
@@ -2,12 +2,11 @@
 
 
 from unittest import skipUnless
+from unittest.mock import patch
 
 import ddt
 from django.conf import settings
 from django.test import TestCase
-from mock import patch
-from six.moves import map
 
 from common.djangoapps.pipeline_mako import compressed_css, compressed_js, render_require_js_path_overrides
 
@@ -65,11 +64,11 @@ class PipelineRenderTest(TestCase):
         with self.settings(PIPELINE=pipeline):
             # Verify the default behavior
             css_include = compressed_css('style-main-v1')
-            assert u'lms-main-v1.css' in css_include
+            assert 'lms-main-v1.css' in css_include
 
             # Verify that raw keyword causes raw URLs to be emitted
             css_include = compressed_css('style-main-v1', raw=True)
-            assert u'lms-main-v1.css?raw' in css_include
+            assert 'lms-main-v1.css?raw' in css_include
 
     @patch('django.contrib.staticfiles.storage.staticfiles_storage.exists', return_value=True)
     @patch('common.djangoapps.static_replace.try_staticfiles_lookup', side_effect=mock_staticfiles_lookup)
@@ -83,10 +82,10 @@ class PipelineRenderTest(TestCase):
         pipeline['PIPELINE_ENABLED'] = True
         with self.settings(PIPELINE=pipeline):
             js_include = compressed_js('base_application')
-            assert u'lms-base-application.js' in js_include
+            assert 'lms-base-application.js' in js_include
 
         # Verify that multiple JS files are rendered with the pipeline disabled
         pipeline['PIPELINE_ENABLED'] = False
         with self.settings(PIPELINE=pipeline):
             js_include = compressed_js('base_application')
-            assert u'/static/js/src/logger.js' in js_include
+            assert '/static/js/src/logger.js' in js_include