diff --git a/projects/amrdeveloper.github.io/GQL/package.yml b/projects/amrdeveloper.github.io/GQL/package.yml
index 8a7d9151..a2b0e62b 100644
--- a/projects/amrdeveloper.github.io/GQL/package.yml
+++ b/projects/amrdeveloper.github.io/GQL/package.yml
@@ -23,69 +23,50 @@ provides:
 test:
   dependencies:
     git-scm.org: ^2
+    gnu.org/sed: '*'
+  fixture: |
+    SELECT 1
+    SELECT 1 + 2
+    SELECT LEN("Git Query Language")
+    SELECT "One" IN ("One", "Two", "Three")
+    SELECT "Git Query Language" LIKE "%Query%"
+
+    SELECT DISTINCT title AS tt message FROM commits
+    SELECT name, COUNT(name) AS commit_num FROM commits GROUP BY name ORDER BY commit_num DESC LIMIT 10
+    SELECT commit_count FROM branches WHERE commit_count BETWEEN 0 .. 10
+
+    SELECT * FROM refs WHERE type = "branch"
+    SELECT * FROM refs ORDER BY type
+
+    SELECT * FROM commits
+    SELECT name, email FROM commits
+    SELECT name, email FROM commits ORDER BY name DESC, email ASC
+    SELECT name, email FROM commits WHERE name LIKE "%gmail%" ORDER BY name
+    SELECT * FROM commits WHERE LOWER(name) = "mxcl"
+    SELECT name FROM commits GROUP By name
+    SELECT name FROM commits GROUP By name having name = "mxcl"
+
+    SELECT * FROM branches
+    SELECT * FROM branches WHERE is_head = true
+    SELECT name, LEN(name) FROM branches
+
+    SELECT * FROM tags
+    SELECT * FROM tags OFFSET 1 LIMIT 1
   script:
     - git clone https://github.com/pkgxdev/pkgx
-    - run: cat $FIXTURE | gitql --repos pkgx
-      fixture: |
-        SELECT 1
-        SELECT 1 + 2
-        SELECT LEN("Git Query Language")
-        SELECT "One" IN ("One", "Two", "Three")
-        SELECT "Git Query Language" LIKE "%Query%"
-
-        SELECT DISTINCT title AS tt message FROM commits
-        SELECT name, COUNT(name) AS commit_num FROM commits GROUP BY name ORDER BY commit_num DESC LIMIT 10
-        SELECT commit_count FROM branches WHERE commit_count BETWEEN 0 .. 10
-
-        SELECT * FROM refs WHERE type = "branch"
-        SELECT * FROM refs ORDER BY type
-
-        SELECT * FROM commits
-        SELECT name, email FROM commits
-        SELECT name, email FROM commits ORDER BY name DESC, email ASC
-        SELECT name, email FROM commits WHERE name LIKE "%gmail%" ORDER BY name
-        SELECT * FROM commits WHERE LOWER(name) = "mxcl"
-        SELECT name FROM commits GROUP By name
-        SELECT name FROM commits GROUP By name having name = "mxcl"
-
-        SELECT * FROM branches
-        SELECT * FROM branches WHERE is_head = true
-        SELECT name, LEN(name) FROM branches
-
-        SELECT * FROM tags
-        SELECT * FROM tags OFFSET 1 LIMIT 1
-        exit
+    - run: |
+        echo 'exit' >>$FIXTURE
+        cat $FIXTURE | gitql --repos pkgx
       if: <0.10.0
     - run: |
         gitql <$FIXTURE
         gitql -q 'SELECT 1'
-      fixture: |
-        SELECT 1
-        SELECT 1 + 2
-        SELECT LEN("Git Query Language")
-        SELECT "One" IN ("One", "Two", "Three")
-        SELECT "Git Query Language" LIKE "%Query%"
-
-        SELECT DISTINCT title AS tt message FROM commits
-        SELECT name, COUNT(name) AS commit_num FROM commits GROUP BY name ORDER BY commit_num DESC LIMIT 10
-        SELECT commit_count FROM branches WHERE commit_count BETWEEN 0 .. 10
-
-        SELECT * FROM refs WHERE type = "branch"
-        SELECT * FROM refs ORDER BY type
-
-        SELECT * FROM commits
-        SELECT name, email FROM commits
-        SELECT name, email FROM commits ORDER BY name DESC, email ASC
-        SELECT name, email FROM commits WHERE name LIKE "%gmail%" ORDER BY name
-        SELECT * FROM commits WHERE LOWER(name) = "mxcl"
-        SELECT name FROM commits GROUP By name
-        SELECT name FROM commits GROUP By name having name = "mxcl"
-
-        SELECT * FROM branches
-        SELECT * FROM branches WHERE is_head = true
-        SELECT name, LEN(name) FROM branches
-
-        SELECT * FROM tags
-        SELECT * FROM tags OFFSET 1 LIMIT 1
-      if: '>=0.10.0'
+      if: '>=0.10.0<0.22.0 || >=0.22.1'
+      working-directory: pkgx
+    # bug in v0.22.0, queries without FROM error out, fixed in v0.22.1
+    - run: |
+        sed -i '/FROM/!d' $FIXTURE
+        gitql <$FIXTURE
+        gitql -q 'SELECT 1 AS just_a_number FROM tags LIMIT 1'
+      if: 0.22.0
       working-directory: pkgx