diff --git a/.gitattributes b/.gitattributes
index b73f27d2f..d3e940016 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,4 @@
 .gitignore export-ignore
 *.py diff=python
 ext-all.js diff=minjs
+*.state -merge -text
diff --git a/deluge/tests/test_torrentmanager.py b/deluge/tests/test_torrentmanager.py
index f22f5be8b..9cfca328f 100644
--- a/deluge/tests/test_torrentmanager.py
+++ b/deluge/tests/test_torrentmanager.py
@@ -12,11 +12,9 @@ from unittest import mock
 
 import pytest
 from twisted.internet import defer, task
-from twisted.trial import unittest
 
 from deluge import component
 from deluge.bencode import bencode
-from deluge.common import windows_check
 from deluge.core.core import Core
 from deluge.core.rpcserver import RPCServer
 from deluge.error import InvalidTorrentError
@@ -141,10 +139,6 @@ class TorrentmanagerTestCase(BaseTestCase):
             common.get_test_data_file('utf8_filename_torrents.state'),
             os.path.join(self.config_dir, 'state', 'torrents.state'),
         )
-        if windows_check():
-            raise unittest.SkipTest(
-                'Windows ModuleNotFoundError due to Linux line ending'
-            )
 
         state = self.tm.open_state()
         self.assertEqual(len(state.torrents), 1)