diff --git a/script/tc b/script/tc
index 1fdda84..48ba316 100755
--- a/script/tc
+++ b/script/tc
@@ -196,9 +196,9 @@ manifests = if options[:rdfstar]
     |man| "https://w3c.github.io/rdf-star/tests/#{man}/"
   end
 elsif options[:nquads]
-  [Fixtures::SuiteTest::NQBASE]
+  [Fixtures::SuiteTest::BASE + "rdf11/rdf-n-quads/"]
 else
-  [Fixtures::SuiteTest::BASE]
+  [Fixtures::SuiteTest::BASE + "rdf11/rdf-trig/"]
 end.map {|m| "#{m}manifest.ttl"}
 
 earl_preamble(**options) if options[:earl]
diff --git a/spec/nquads_spec.rb b/spec/nquads_spec.rb
index 72371b0..8c43610 100644
--- a/spec/nquads_spec.rb
+++ b/spec/nquads_spec.rb
@@ -6,29 +6,31 @@
   describe "w3c N-Quads tests" do
     require 'suite_helper'
 
-    Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::NQBASE}manifest.ttl") do |m|
-      describe m.comment do
-        m.entries.each do |t|
-          specify "#{t.name}: #{t.comment}" do
-            t.logger = RDF::Spec.logger
-            t.logger.info t.inspect
-            t.logger.info "source:\n#{t.input}"
+    %w(rdf11/rdf-n-quads/manifest.ttl).each do |man|
+      Fixtures::SuiteTest::Manifest.open(Fixtures::SuiteTest::BASE + man) do |m|
+        describe m.comment do
+          m.entries.each do |t|
+            specify "#{t.name}: #{t.comment}" do
+              t.logger = RDF::Spec.logger
+              t.logger.info t.inspect
+              t.logger.info "source:\n#{t.input}"
 
-            reader = RDF::NQuads::Reader.new(t.input, logger: t.logger, validate: true)
+              reader = RDF::NQuads::Reader.new(t.input, logger: t.logger, validate: true)
 
-            repo = RDF::Repository.new
+              repo = RDF::Repository.new
 
-            if t.positive_test?
-              begin
-                repo << reader
-              rescue Exception => e
-                expect(e.message).to produce("Not exception #{e.inspect}", t.logger)
+              if t.positive_test?
+                begin
+                  repo << reader
+                rescue Exception => e
+                  expect(e.message).to produce("Not exception #{e.inspect}", t.logger)
+                end
+              else
+                expect {repo << reader}.to raise_error(RDF::ReaderError)
               end
-            else
-              expect {repo << reader}.to raise_error(RDF::ReaderError)
-            end
 
-            expect(repo).to be_a(RDF::Enumerable)
+              expect(repo).to be_a(RDF::Enumerable)
+            end
           end
         end
       end
diff --git a/spec/suite_helper.rb b/spec/suite_helper.rb
index c1ce5cd..7bed7ed 100644
--- a/spec/suite_helper.rb
+++ b/spec/suite_helper.rb
@@ -140,8 +140,7 @@ def self.open_file(filename_or_url, **options, &block)
 
 module Fixtures
   module SuiteTest
-    BASE = "https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-trig/"
-    NQBASE = "https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-n-quads/"
+    BASE = "https://w3c.github.io/rdf-tests/rdf/"
     FRAME = JSON.parse(%q({
       "@context": {
         "xsd": "http://www.w3.org/2001/XMLSchema#",
@@ -187,7 +186,7 @@ class Entry < JSON::LD::Resource
       attr_accessor :logger
 
       def base
-        BASE + action.split('/').last
+        RDF::URI(action)
       end
 
       # Alias data and query
diff --git a/spec/suite_spec.rb b/spec/suite_spec.rb
index 0b13b84..09caab2 100644
--- a/spec/suite_spec.rb
+++ b/spec/suite_spec.rb
@@ -6,7 +6,7 @@
     require 'suite_helper'
 
     # TriG/manifest.ttl
-    %w(manifest.ttl).each do |man|
+    %w(rdf11/rdf-trig/manifest.ttl).each do |man|
       Fixtures::SuiteTest::Manifest.open(Fixtures::SuiteTest::BASE + man) do |m|
         describe m.comment do
           m.entries.each do |t|
diff --git a/spec/writer_spec.rb b/spec/writer_spec.rb
index 1adf2ae..b311723 100644
--- a/spec/writer_spec.rb
+++ b/spec/writer_spec.rb
@@ -309,7 +309,7 @@
   describe "w3c trig tests" do
     require 'suite_helper'
 
-    %w(manifest.ttl).each do |man|
+    %w(rdf11/rdf-trig/manifest.ttl).each do |man|
       Fixtures::SuiteTest::Manifest.open(Fixtures::SuiteTest::BASE + man) do |m|
         describe m.comment do
           m.entries.each do |t|