diff --git a/packages/fcl-json/tests/jsonconftest.pp b/packages/fcl-json/tests/jsonconftest.pas
similarity index 100%
rename from packages/fcl-json/tests/jsonconftest.pp
rename to packages/fcl-json/tests/jsonconftest.pas
diff --git a/packages/fcl-json/tests/tcjsonini.pp b/packages/fcl-json/tests/tcjsonini.pas
similarity index 100%
rename from packages/fcl-json/tests/tcjsonini.pp
rename to packages/fcl-json/tests/tcjsonini.pas
diff --git a/packages/fcl-json/tests/tcjsontocode.pp b/packages/fcl-json/tests/tcjsontocode.pas
similarity index 100%
rename from packages/fcl-json/tests/tcjsontocode.pp
rename to packages/fcl-json/tests/tcjsontocode.pas
diff --git a/packages/fcl-json/tests/testcomps.pp b/packages/fcl-json/tests/testcomps.pas
similarity index 100%
rename from packages/fcl-json/tests/testcomps.pp
rename to packages/fcl-json/tests/testcomps.pas
diff --git a/packages/fcl-json/tests/testjson.lpi b/packages/fcl-json/tests/testjson.lpi
index 95eab6032f..bd4363525e 100644
--- a/packages/fcl-json/tests/testjson.lpi
+++ b/packages/fcl-json/tests/testjson.lpi
@@ -41,23 +41,23 @@
         <IsPartOfProject Value="True"/>
       </Unit0>
       <Unit1>
-        <Filename Value="testjsonparser.pp"/>
+        <Filename Value="testjsonparser.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit1>
       <Unit2>
-        <Filename Value="testjsondata.pp"/>
+        <Filename Value="testjsondata.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="testjsonrtti.pp"/>
+        <Filename Value="testjsonrtti.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit3>
       <Unit4>
-        <Filename Value="../src/fpjsonrtti.pp"/>
+        <Filename Value="../src/fpjsonrtti.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit4>
       <Unit5>
-        <Filename Value="testjsonreader.pp"/>
+        <Filename Value="testjsonreader.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit5>
     </Units>
diff --git a/packages/fcl-json/tests/testjsonconf.pp b/packages/fcl-json/tests/testjsonconf.pas
similarity index 100%
rename from packages/fcl-json/tests/testjsonconf.pp
rename to packages/fcl-json/tests/testjsonconf.pas
diff --git a/packages/fcl-json/tests/testjsondata.pp b/packages/fcl-json/tests/testjsondata.pas
similarity index 100%
rename from packages/fcl-json/tests/testjsondata.pp
rename to packages/fcl-json/tests/testjsondata.pas
diff --git a/packages/fcl-json/tests/testjsonparser.pp b/packages/fcl-json/tests/testjsonparser.pas
similarity index 100%
rename from packages/fcl-json/tests/testjsonparser.pp
rename to packages/fcl-json/tests/testjsonparser.pas
diff --git a/packages/fcl-json/tests/testjsonreader.pp b/packages/fcl-json/tests/testjsonreader.pas
similarity index 100%
rename from packages/fcl-json/tests/testjsonreader.pp
rename to packages/fcl-json/tests/testjsonreader.pas
diff --git a/packages/fcl-json/tests/testjsonrtti.pp b/packages/fcl-json/tests/testjsonrtti.pas
similarity index 100%
rename from packages/fcl-json/tests/testjsonrtti.pp
rename to packages/fcl-json/tests/testjsonrtti.pas
diff --git a/tests/Makefile b/tests/Makefile
index 454c1963d0..94f18086e0 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2208,7 +2208,7 @@ TESTDIRECTDIRS=
 TESTSUBDIRS=cg cg/variants cg/cdecl cpu16 cpu16/i8086 library opt $(addprefix units/,$(TESTUNITDIRS))
 TESTPACKAGESDIRS=win-base webtbs hash fcl-registry fcl-process zlib fcl-db fcl-xml cocoaint bzip2
 TESTPACKAGESUBDIRS=$(addprefix packages/,$(TESTPACKAGESDIRS))
-TESTPACKAGESDIRECTDIRS=rtl-objpas rtl-generics hash regexpr fcl-registry fcl-passrc
+TESTPACKAGESDIRECTDIRS=rtl-objpas rtl-generics hash regexpr fcl-registry fcl-passrc fcl-json
 TESTPACKAGESDIRECTSUBDIRS=$(addprefix ../packages/,$(addsuffix /tests,$(TESTPACKAGESDIRECTDIRS)))
 ifdef QUICKTEST
 export QUICKTEST
diff --git a/tests/Makefile.fpc b/tests/Makefile.fpc
index 75525d7479..6ce171584b 100644
--- a/tests/Makefile.fpc
+++ b/tests/Makefile.fpc
@@ -159,7 +159,7 @@ TESTDIRECTDIRS=
 TESTSUBDIRS=cg cg/variants cg/cdecl cpu16 cpu16/i8086 library opt $(addprefix units/,$(TESTUNITDIRS))
 TESTPACKAGESDIRS=win-base webtbs hash fcl-registry fcl-process zlib fcl-db fcl-xml cocoaint bzip2
 TESTPACKAGESUBDIRS=$(addprefix packages/,$(TESTPACKAGESDIRS))
-TESTPACKAGESDIRECTDIRS=rtl-objpas rtl-generics hash regexpr fcl-registry fcl-passrc
+TESTPACKAGESDIRECTDIRS=rtl-objpas rtl-generics hash regexpr fcl-registry fcl-passrc fcl-json
 TESTPACKAGESDIRECTSUBDIRS=$(addprefix ../packages/,$(addsuffix /tests,$(TESTPACKAGESDIRECTDIRS)))
 
 ifdef QUICKTEST