diff --git a/glanceclient/__init__.py b/glanceclient/__init__.py
index f59bd0bb..f9670312 100644
--- a/glanceclient/__init__.py
+++ b/glanceclient/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2012 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/tests/test_base.py b/tests/test_base.py
index d6ee6a9d..239a3380 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -13,7 +13,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import testtools
 
diff --git a/tests/test_shell.py b/tests/test_shell.py
index 45cbeae5..1cdee8c9 100644
--- a/tests/test_shell.py
+++ b/tests/test_shell.py
@@ -13,7 +13,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import os
diff --git a/tests/v1/test_legacy_shell.py b/tests/v1/test_legacy_shell.py
index 53adb453..f7e10777 100644
--- a/tests/v1/test_legacy_shell.py
+++ b/tests/v1/test_legacy_shell.py
@@ -13,7 +13,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import mock
 import testtools
diff --git a/tests/v1/test_shell.py b/tests/v1/test_shell.py
index 4cc01dcc..72e38e8c 100644
--- a/tests/v1/test_shell.py
+++ b/tests/v1/test_shell.py
@@ -13,7 +13,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import json
diff --git a/tests/v2/test_shell_v2.py b/tests/v2/test_shell_v2.py
index 916b4c22..f92765ce 100644
--- a/tests/v2/test_shell_v2.py
+++ b/tests/v2/test_shell_v2.py
@@ -13,7 +13,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import mock
 import six