diff --git a/test/assets/CONNECTION.xml b/test/assets/CONNECTION.xml
index 392d112..6cce11f 100644
--- a/test/assets/CONNECTION.xml
+++ b/test/assets/CONNECTION.xml
@@ -1 +1 @@
-<connection authentication='sspi' class='sqlserver' dbname='TestV1' odbc-native-protocol='yes' one-time-sql='' server='mssql2012.test.tsi.lan' username=''></connection>
+<connection authentication='sspi' class='sqlserver' dbname='TestV1' odbc-native-protocol='yes' one-time-sql='' server='mssql2012' username=''></connection>
diff --git a/test/assets/TABLEAU_10_TDS.tds b/test/assets/TABLEAU_10_TDS.tds
index 7a81784..01fe7c3 100644
--- a/test/assets/TABLEAU_10_TDS.tds
+++ b/test/assets/TABLEAU_10_TDS.tds
@@ -1 +1 @@
-<?xml version='1.0' encoding='utf-8' ?><datasource caption='xy+ (Multiple Connections)' inline='true' name='federated.1s4nxn20cywkdv13ql0yk0g1mpdx' version='10.0'><connection class='federated'><named-connections><named-connection caption='mysql55.test.tsi.lan' name='mysql.1ewmkrw0mtgsev1dnurma1blii4x'><connection class='mysql' dbname='testv1' odbc-native-protocol='yes' port='3306' server='mysql55.test.tsi.lan' source-charset='' username='test' /></named-connection><named-connection caption='mssql2012.test.tsi.lan' name='sqlserver.1erdwp01uqynlb14ul78p0haai2r'><connection authentication='sqlserver' class='sqlserver' dbname='TestV1' odbc-native-protocol='yes' one-time-sql='' server='mssql2012.test.tsi.lan' username='test' /></named-connection></named-connections></connection></datasource>
+<?xml version='1.0' encoding='utf-8' ?><datasource caption='xy+ (Multiple Connections)' inline='true' name='federated.1s4nxn20cywkdv13ql0yk0g1mpdx' version='10.0'><connection class='federated'><named-connections><named-connection caption='mysql55' name='mysql.1ewmkrw0mtgsev1dnurma1blii4x'><connection class='mysql' dbname='TestV1' odbc-native-protocol='yes' port='3306' server='mysql55' source-charset='' username='test' /></named-connection><named-connection caption='mssql2012' name='sqlserver.1erdwp01uqynlb14ul78p0haai2r'><connection authentication='sqlserver' class='sqlserver' dbname='TestV1' odbc-native-protocol='yes' one-time-sql='' server='mssql2012' username='test' /></named-connection></named-connections></connection></datasource>
diff --git a/test/bvt.py b/test/bvt.py
index 4ea3d11..60e42c3 100644
--- a/test/bvt.py
+++ b/test/bvt.py
@@ -42,7 +42,7 @@ def test_can_extract_federated_connections(self):
         connections = parser.get_connections()
         self.assertIsInstance(connections, list)
         self.assertIsInstance(connections[0], Connection)
-        self.assertEqual(connections[0].dbname, 'testv1')
+        self.assertEqual(connections[0].dbname, 'TestV1')
 
 
 class ConnectionModelTests(unittest.TestCase):
@@ -54,18 +54,18 @@ def test_can_read_attributes_from_connection(self):
         conn = Connection(self.connection)
         self.assertEqual(conn.dbname, 'TestV1')
         self.assertEqual(conn.username, '')
-        self.assertEqual(conn.server, 'mssql2012.test.tsi.lan')
+        self.assertEqual(conn.server, 'mssql2012')
         self.assertEqual(conn.dbclass, 'sqlserver')
         self.assertEqual(conn.authentication, 'sspi')
 
     def test_can_write_attributes_to_connection(self):
         conn = Connection(self.connection)
         conn.dbname = 'BubblesInMyDrink'
-        conn.server = 'mssql2014.test.tsi.lan'
+        conn.server = 'mssql2014'
         conn.username = 'bob'
         self.assertEqual(conn.dbname, 'BubblesInMyDrink')
         self.assertEqual(conn.username, 'bob')
-        self.assertEqual(conn.server, 'mssql2014.test.tsi.lan')
+        self.assertEqual(conn.server, 'mssql2014')
 
     def test_bad_dbclass_rasies_attribute_error(self):
         conn = Connection(self.connection)
@@ -117,15 +117,15 @@ def test_can_extract_connection(self):
 
     def test_can_save_tds(self):
         original_tds = Datasource.from_file(self.tds_file.name)
-        original_tds.connections[0].dbname = 'newdb.test.tsi.lan'
+        original_tds.connections[0].dbname = 'newdb'
         original_tds.save()
 
         new_tds = Datasource.from_file(self.tds_file.name)
-        self.assertEqual(new_tds.connections[0].dbname, 'newdb.test.tsi.lan')
+        self.assertEqual(new_tds.connections[0].dbname, 'newdb')
 
     def test_save_has_xml_declaration(self):
         original_tds = Datasource.from_file(self.tds_file.name)
-        original_tds.connections[0].dbname = 'newdb.test.tsi.lan'
+        original_tds.connections[0].dbname = 'newdb'
 
         original_tds.save()
 
@@ -158,11 +158,11 @@ def test_can_extract_connection(self):
 
     def test_can_save_tds(self):
         original_tds = Datasource.from_file(self.tds_file.name)
-        original_tds.connections[0].dbname = 'newdb.test.tsi.lan'
+        original_tds.connections[0].dbname = 'newdb'
         original_tds.save()
 
         new_tds = Datasource.from_file(self.tds_file.name)
-        self.assertEqual(new_tds.connections[0].dbname, 'newdb.test.tsi.lan')
+        self.assertEqual(new_tds.connections[0].dbname, 'newdb')
 
 
 class DatasourceModelV10TDSXTests(unittest.TestCase):
@@ -183,22 +183,22 @@ def test_can_open_tdsx(self):
 
     def test_can_open_tdsx_and_save_changes(self):
         original_tdsx = Datasource.from_file(self.tdsx_file.name)
-        original_tdsx.connections[0].server = 'newdb.test.tsi.lan'
+        original_tdsx.connections[0].server = 'newdb'
         original_tdsx.save()
 
         new_tdsx = Datasource.from_file(self.tdsx_file.name)
         self.assertEqual(new_tdsx.connections[
-                         0].server, 'newdb.test.tsi.lan')
+                         0].server, 'newdb')
 
     def test_can_open_tdsx_and_save_as_changes(self):
         new_tdsx_filename = 'newtdsx.tdsx'
         original_wb = Datasource.from_file(self.tdsx_file.name)
-        original_wb.connections[0].server = 'newdb.test.tsi.lan'
+        original_wb.connections[0].server = 'newdb'
         original_wb.save_as(new_tdsx_filename)
 
         new_wb = Datasource.from_file(new_tdsx_filename)
         self.assertEqual(new_wb.connections[
-                         0].server, 'newdb.test.tsi.lan')
+                         0].server, 'newdb')
         os.unlink(new_tdsx_filename)
 
 
@@ -230,12 +230,12 @@ def test_has_filename(self):
 
     def test_can_update_datasource_connection_and_save(self):
         original_wb = Workbook(self.workbook_file.name)
-        original_wb.datasources[0].connections[0].dbname = 'newdb.test.tsi.lan'
+        original_wb.datasources[0].connections[0].dbname = 'newdb'
         original_wb.save()
 
         new_wb = Workbook(self.workbook_file.name)
         self.assertEqual(new_wb.datasources[0].connections[
-                         0].dbname, 'newdb.test.tsi.lan')
+                         0].dbname, 'newdb')
 
 
 class WorkbookModelV10Tests(unittest.TestCase):
@@ -260,17 +260,17 @@ def test_can_extract_datasourceV10(self):
 
     def test_can_update_datasource_connection_and_saveV10(self):
         original_wb = Workbook(self.workbook_file.name)
-        original_wb.datasources[0].connections[0].dbname = 'newdb.test.tsi.lan'
+        original_wb.datasources[0].connections[0].dbname = 'newdb'
 
         original_wb.save()
 
         new_wb = Workbook(self.workbook_file.name)
         self.assertEqual(new_wb.datasources[0].connections[
-                         0].dbname, 'newdb.test.tsi.lan')
+                         0].dbname, 'newdb')
 
     def test_save_has_xml_declaration(self):
         original_wb = Workbook(self.workbook_file.name)
-        original_wb.datasources[0].connections[0].dbname = 'newdb.test.tsi.lan'
+        original_wb.datasources[0].connections[0].dbname = 'newdb'
 
         original_wb.save()
 
@@ -298,22 +298,22 @@ def test_can_open_twbx(self):
 
     def test_can_open_twbx_and_save_changes(self):
         original_wb = Workbook(self.workbook_file.name)
-        original_wb.datasources[0].connections[0].server = 'newdb.test.tsi.lan'
+        original_wb.datasources[0].connections[0].server = 'newdb'
         original_wb.save()
 
         new_wb = Workbook(self.workbook_file.name)
         self.assertEqual(new_wb.datasources[0].connections[
-                         0].server, 'newdb.test.tsi.lan')
+                         0].server, 'newdb')
 
     def test_can_open_twbx_and_save_as_changes(self):
         new_twbx_filename = 'newtwbx.twbx'
         original_wb = Workbook(self.workbook_file.name)
-        original_wb.datasources[0].connections[0].server = 'newdb.test.tsi.lan'
+        original_wb.datasources[0].connections[0].server = 'newdb'
         original_wb.save_as(new_twbx_filename)
 
         new_wb = Workbook(new_twbx_filename)
         self.assertEqual(new_wb.datasources[0].connections[
-                         0].server, 'newdb.test.tsi.lan')
+                         0].server, 'newdb')
 
         os.unlink(new_twbx_filename)