diff --git a/powerline/segments/i3wm.py b/powerline/segments/i3wm.py
index de601d78..f0c16427 100644
--- a/powerline/segments/i3wm.py
+++ b/powerline/segments/i3wm.py
@@ -5,10 +5,6 @@ from powerline.theme import requires_segment_info
 
 
 conn = None
-try:
-    import i3ipc
-except ImportError:
-    import i3 as conn
 
 
 def calcgrp(w):
@@ -39,7 +35,12 @@ def workspaces(pl, only_show=None, strip=0):
 	'''
 	global conn
 	if not conn:
-		conn = i3ipc.Connection()
+		try:
+			import i3ipc
+		except ImportError:
+			import i3 as conn
+		else:
+			conn = i3ipc.Connection()
 
 	return [{
 		'contents': w['name'][min(len(w['name']), strip):],
diff --git a/tests/test_segments.py b/tests/test_segments.py
index 08fc520b..aa38012c 100644
--- a/tests/test_segments.py
+++ b/tests/test_segments.py
@@ -7,7 +7,7 @@ import os
 from functools import partial
 from collections import namedtuple
 
-from powerline.segments import shell, tmux, pdb
+from powerline.segments import shell, tmux, pdb, i3wm
 from powerline.lib.vcs import get_fallback_create_watcher
 from powerline.lib.unicode import out_u
 
@@ -816,6 +816,50 @@ class TestWthr(TestCommon):
 			self.module.weather.shutdown()
 
 
+class TestI3WM(TestCase):
+	def test_workspaces(self):
+		pl = Pl()
+		with replace_attr(i3wm, 'conn', Args(get_workspaces=lambda: iter([
+			{'name': '1: w1', 'focused': False, 'urgent': False, 'visible': False},
+			{'name': '2: w2', 'focused': False, 'urgent': False, 'visible': True},
+			{'name': '3: w3', 'focused': False, 'urgent': True, 'visible': True},
+			{'name': '4: w4', 'focused': True, 'urgent': True, 'visible': True},
+		]))):
+			self.assertEqual(i3wm.workspaces(pl=pl), [
+				{'contents': '1: w1', 'highlight_groups': ['workspace']},
+				{'contents': '2: w2', 'highlight_groups': ['w_visible', 'workspace']},
+				{'contents': '3: w3', 'highlight_groups': ['w_urgent', 'w_visible', 'workspace']},
+				{'contents': '4: w4', 'highlight_groups': ['w_focused', 'w_urgent', 'w_visible', 'workspace']},
+			])
+			self.assertEqual(i3wm.workspaces(pl=pl, only_show=None), [
+				{'contents': '1: w1', 'highlight_groups': ['workspace']},
+				{'contents': '2: w2', 'highlight_groups': ['w_visible', 'workspace']},
+				{'contents': '3: w3', 'highlight_groups': ['w_urgent', 'w_visible', 'workspace']},
+				{'contents': '4: w4', 'highlight_groups': ['w_focused', 'w_urgent', 'w_visible', 'workspace']},
+			])
+			self.assertEqual(i3wm.workspaces(pl=pl, only_show=['focused', 'urgent']), [
+				{'contents': '3: w3', 'highlight_groups': ['w_urgent', 'w_visible', 'workspace']},
+				{'contents': '4: w4', 'highlight_groups': ['w_focused', 'w_urgent', 'w_visible', 'workspace']},
+			])
+			self.assertEqual(i3wm.workspaces(pl=pl, only_show=['visible']), [
+				{'contents': '2: w2', 'highlight_groups': ['w_visible', 'workspace']},
+				{'contents': '3: w3', 'highlight_groups': ['w_urgent', 'w_visible', 'workspace']},
+				{'contents': '4: w4', 'highlight_groups': ['w_focused', 'w_urgent', 'w_visible', 'workspace']},
+			])
+			self.assertEqual(i3wm.workspaces(pl=pl, only_show=['visible'], strip=3), [
+				{'contents': 'w2', 'highlight_groups': ['w_visible', 'workspace']},
+				{'contents': 'w3', 'highlight_groups': ['w_urgent', 'w_visible', 'workspace']},
+				{'contents': 'w4', 'highlight_groups': ['w_focused', 'w_urgent', 'w_visible', 'workspace']},
+			])
+
+	def test_mode(self):
+		pl = Pl()
+		self.assertEqual(i3wm.mode(pl=pl, segment_info={'mode': 'default'}), None)
+		self.assertEqual(i3wm.mode(pl=pl, segment_info={'mode': 'test'}), 'test')
+		self.assertEqual(i3wm.mode(pl=pl, segment_info={'mode': 'default'}, names={'default': 'test'}), 'test')
+		self.assertEqual(i3wm.mode(pl=pl, segment_info={'mode': 'test'}, names={'default': 'test', 'test': 't'}), 't')
+
+
 class TestMail(TestCommon):
 	module_name = 'mail'