diff --git a/python/pyspark/sql/session.py b/python/pyspark/sql/session.py
index 52e7f3d348ab96abd7e7d1c3f7e80273ca2dc9c9..8f7dcb54a7a2a4b64699e1919ea34c4a44e8827f 100644
--- a/python/pyspark/sql/session.py
+++ b/python/pyspark/sql/session.py
@@ -144,7 +144,7 @@ class SparkSession(object):
             default.
 
             >>> s1 = SparkSession.builder.config("k1", "v1").getOrCreate()
-            >>> s1.conf.get("k1") == "v1"
+            >>> s1.conf.get("k1") == s1.sparkContext.getConf().get("k1") == "v1"
             True
 
             In case an existing SparkSession is returned, the config options specified
@@ -168,6 +168,8 @@ class SparkSession(object):
                     session = SparkSession(sc)
                 for key, value in self._options.items():
                     session.conf.set(key, value)
+                for key, value in self._options.items():
+                    session.sparkContext._conf.set(key, value)
                 return session
 
     builder = Builder()