diff --git a/assets/python/runtime.txt b/assets/python/runtime.txt
index 2728edc83..1052ccb67 100644
--- a/assets/python/runtime.txt
+++ b/assets/python/runtime.txt
@@ -1 +1 @@
-\r\r\n\npython-2.7.x\n\n\r\r
+python-3.x
diff --git a/assets/python/server.py b/assets/python/server.py
index b83876f2a..536b1a135 100644
--- a/assets/python/server.py
+++ b/assets/python/server.py
@@ -1,5 +1,5 @@
-from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
-from SocketServer import ThreadingMixIn
+from http.server import HTTPServer, BaseHTTPRequestHandler
+from socketserver import ThreadingMixIn
 import os
 
 class Handler(BaseHTTPRequestHandler):
@@ -7,8 +7,8 @@ def do_GET(self):
         self.send_response(200)
         self.end_headers()
         message =  "Hello python, world!"
-        self.wfile.write(message)
-        self.wfile.write('\n')
+        self.wfile.write(message.encode('utf-8'))
+        self.wfile.write('\n'.encode('utf-8'))
         return
 
 class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
@@ -17,7 +17,7 @@ class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
 if __name__ == '__main__':
     port = int(os.environ.get('PORT', '8080'))
     host = os.environ.get('VCAP_APP_HOST', '127.0.0.1')
-    print "Goin to start sever on %s:%s" % (host, port)
+    print("Going to start server on %s:%s" % (host, port))
     server = ThreadedHTTPServer((host, port), Handler)
-    print 'Starting server, use <Ctrl-C> to stop'
+    print('Starting server, use <Ctrl-C> to stop')
     server.serve_forever()