diff --git a/basis/db/postgresql/postgresql-tests.factor b/basis/db/postgresql/postgresql-tests.factor
index eb1370fc74..2d27c1218c 100644
--- a/basis/db/postgresql/postgresql-tests.factor
+++ b/basis/db/postgresql/postgresql-tests.factor
@@ -4,86 +4,84 @@ db.tuples db.types unicode.case accessors system db.tester ;
 IN: db.postgresql.tests
 
 
-os windows? cpu x86.64? and [
-    ! Ensure the table exists
-    [ ] [ postgresql-test-db [ ] with-db ] unit-test
+! Ensure the table exists
+[ ] [ postgresql-test-db [ ] with-db ] unit-test
 
-    [ ] [
-        postgresql-test-db [
-            [ "drop table person;" sql-command ] ignore-errors
-            "create table person (name varchar(30), country varchar(30));"
-                sql-command
-
-            "insert into person values('John', 'America');" sql-command
-            "insert into person values('Jane', 'New Zealand');" sql-command
-        ] with-db
-    ] unit-test
-
-    [
-        {
-            { "John" "America" }
-            { "Jane" "New Zealand" }
-        }
-    ] [
-        postgresql-test-db [
-            "select * from person" sql-query
-        ] with-db
-    ] unit-test
-
-    [
-        {
-            { "John" "America" }
-            { "Jane" "New Zealand" }
-        }
-    ] [ postgresql-test-db [ "select * from person" sql-query ] with-db ] unit-test
-
-    [
-    ] [
-        postgresql-test-db [
-            "insert into person(name, country) values('Jimmy', 'Canada')"
+[ ] [
+    postgresql-test-db [
+        [ "drop table person;" sql-command ] ignore-errors
+        "create table person (name varchar(30), country varchar(30));"
             sql-command
-        ] with-db
-    ] unit-test
 
-    [
-        {
-            { "John" "America" }
-            { "Jane" "New Zealand" }
-            { "Jimmy" "Canada" }
-        }
-    ] [ postgresql-test-db [ "select * from person" sql-query ] with-db ] unit-test
+        "insert into person values('John', 'America');" sql-command
+        "insert into person values('Jane', 'New Zealand');" sql-command
+    ] with-db
+] unit-test
 
-    [
-        postgresql-test-db [
-            [
-                "insert into person(name, country) values('Jose', 'Mexico')" sql-command
-                "insert into person(name, country) values('Jose', 'Mexico')" sql-command
-                "oops" throw
-            ] with-transaction
-        ] with-db
-    ] must-fail
+[
+    {
+        { "John" "America" }
+        { "Jane" "New Zealand" }
+    }
+] [
+    postgresql-test-db [
+        "select * from person" sql-query
+    ] with-db
+] unit-test
 
-    [ 3 ] [
-        postgresql-test-db [
-            "select * from person" sql-query length
-        ] with-db
-    ] unit-test
+[
+    {
+        { "John" "America" }
+        { "Jane" "New Zealand" }
+    }
+] [ postgresql-test-db [ "select * from person" sql-query ] with-db ] unit-test
 
-    [
-    ] [
-        postgresql-test-db [
-            [
-                "insert into person(name, country) values('Jose', 'Mexico')"
-                sql-command
-                "insert into person(name, country) values('Jose', 'Mexico')"
-                sql-command
-            ] with-transaction
-        ] with-db
-    ] unit-test
+[
+] [
+    postgresql-test-db [
+        "insert into person(name, country) values('Jimmy', 'Canada')"
+        sql-command
+    ] with-db
+] unit-test
 
-    [ 5 ] [
-        postgresql-test-db [
-            "select * from person" sql-query length
-        ] with-db
-    ] unit-test
-] unless
+[
+    {
+        { "John" "America" }
+        { "Jane" "New Zealand" }
+        { "Jimmy" "Canada" }
+    }
+] [ postgresql-test-db [ "select * from person" sql-query ] with-db ] unit-test
+
+[
+    postgresql-test-db [
+        [
+            "insert into person(name, country) values('Jose', 'Mexico')" sql-command
+            "insert into person(name, country) values('Jose', 'Mexico')" sql-command
+            "oops" throw
+        ] with-transaction
+    ] with-db
+] must-fail
+
+[ 3 ] [
+    postgresql-test-db [
+        "select * from person" sql-query length
+    ] with-db
+] unit-test
+
+[
+] [
+    postgresql-test-db [
+        [
+            "insert into person(name, country) values('Jose', 'Mexico')"
+            sql-command
+            "insert into person(name, country) values('Jose', 'Mexico')"
+            sql-command
+        ] with-transaction
+    ] with-db
+] unit-test
+
+[ 5 ] [
+    postgresql-test-db [
+        "select * from person" sql-query length
+    ] with-db
+] unit-test
\ No newline at end of file