use Test::More tests => 6;
+use_ok( 'OpenILS::Application::Storage::Driver::Pg' );
use_ok( 'OpenILS::Application::Storage::Driver::Pg::cdbi' );
use_ok( 'OpenILS::Application::Storage::Driver::Pg::fts' );
-use_ok( 'OpenILS::Application::Storage::Driver::Pg::QueryParser' );
-
-# These modules are not meant to be loaded as a normal Perl module
-# Lp 1835620 enables these tests because it fixes the code.
-use_ok( 'OpenILS::Application::Storage::Driver::Pg' );
-use_ok( 'OpenILS::Application::Storage::Driver::Pg::dbi' );
use_ok( 'OpenILS::Application::Storage::Driver::Pg::storage' );
+use_ok( 'OpenILS::Application::Storage::Driver::Pg::dbi' );
+use_ok( 'OpenILS::Application::Storage::Driver::Pg::QueryParser' );