diff --git a/airflow/configuration.py b/airflow/configuration.py
index e325067dbfa50..460d97579ad8b 100644
--- a/airflow/configuration.py
+++ b/airflow/configuration.py
@@ -42,7 +42,10 @@
 warnings.filterwarnings(
     action='default', category=PendingDeprecationWarning, module='airflow')
 
-ConfigParser = configparser.SafeConfigParser
+if six.PY3:
+    ConfigParser = configparser.ConfigParser
+else:
+    ConfigParser = configparser.SafeConfigParser
 
 
 def generate_fernet_key():