diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bcb241d3..283418fd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,10 +4,11 @@ on: [push]
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9]
+        os: [ubuntu-latest, windows-latest]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -26,5 +27,4 @@ jobs:
         pip install -e '.[test]'
     - name: Run tests
       run: |
-        pytest -n auto -m "not serial"
-        pytest -m "serial"
+        pytest -vv
diff --git a/datasette/views/table.py b/datasette/views/table.py
index 1bda7496..876a0c81 100644
--- a/datasette/views/table.py
+++ b/datasette/views/table.py
@@ -674,12 +674,11 @@ class TableView(RowTableShared):
         else:
             page_size = self.ds.page_size
 
-        sql_no_limit = (
-            "select {select_all_columns} from {table_name} {where}{order_by}".format(
+        sql_no_order_no_limit = (
+            "select {select_all_columns} from {table_name} {where}".format(
                 select_all_columns=select_all_columns,
                 table_name=escape_sqlite(table),
                 where=where_clause,
-                order_by=order_by,
             )
         )
         sql = "select {select_specified_columns} from {table_name} {where}{order_by} limit {page_size}{offset}".format(
@@ -736,7 +735,7 @@ class TableView(RowTableShared):
                     self.ds,
                     request,
                     database,
-                    sql=sql_no_limit,
+                    sql=sql_no_order_no_limit,
                     params=params,
                     table=table,
                     metadata=table_metadata,
diff --git a/tests/test_cli_serve_server.py b/tests/test_cli_serve_server.py
index 73439125..1c31e2a3 100644
--- a/tests/test_cli_serve_server.py
+++ b/tests/test_cli_serve_server.py
@@ -25,7 +25,9 @@ def test_serve_localhost_https(ds_localhost_https_server):
 
 
 @pytest.mark.serial
-@pytest.mark.skipif(not hasattr(socket, "AF_UNIX"), reason="Requires socket.AF_UNIX support")
+@pytest.mark.skipif(
+    not hasattr(socket, "AF_UNIX"), reason="Requires socket.AF_UNIX support"
+)
 def test_serve_unix_domain_socket(ds_unix_domain_socket_server):
     _, uds = ds_unix_domain_socket_server
     transport = httpx.HTTPTransport(uds=uds)