diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php
index eddd456a7b866..46309c6d97dfa 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php
@@ -7,11 +7,16 @@
 
 namespace Magento\GraphQl\Catalog;
 
-use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Catalog\Api\CategoryLinkManagementInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\Product\Attribute\Source\Status as productStatus;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogInventory\Model\Configuration;
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
  * Class CategoryProductsCountTest
@@ -25,10 +30,39 @@ class CategoryProductsCountTest extends GraphQlAbstract
      */
     private $productRepository;
 
+    /**
+     * @var Config $config
+     */
+    private $resourceConfig;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var ReinitableConfigInterface
+     */
+    private $reinitConfig;
+
+    /**
+     * @var CategoryLinkManagementInterface
+     */
+    private $categoryLinkManagement;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $objectManager = Bootstrap::getObjectManager();
+        parent::setUp();
+
+        $objectManager = ObjectManager::getInstance();
         $this->productRepository = $objectManager->create(ProductRepositoryInterface::class);
+        $this->resourceConfig = $objectManager->get(Config::class);
+        $this->scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+        $this->reinitConfig = $objectManager->get(ReinitableConfigInterface::class);
+        $this->categoryLinkManagement = $objectManager->get(CategoryLinkManagementInterface::class);
     }
 
     /**
@@ -82,6 +116,15 @@ public function testCategoryWithInvisibleProduct()
     public function testCategoryWithOutOfStockProductManageStockEnabled()
     {
         $categoryId = 2;
+        $sku = 'simple-out-of-stock';
+        $manageStock = $this->scopeConfig->getValue(Configuration::XML_PATH_MANAGE_STOCK);
+
+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_MANAGE_STOCK, 1);
+        $this->reinitConfig->reinit();
+
+        // need to resave product to reindex it with new configuration.
+        $product = $this->productRepository->get($sku);
+        $this->productRepository->save($product);
 
         $query = <<<QUERY
 {
@@ -93,15 +136,27 @@ public function testCategoryWithOutOfStockProductManageStockEnabled()
 QUERY;
         $response = $this->graphQlQuery($query);
 
+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_MANAGE_STOCK, $manageStock);
+        $this->reinitConfig->reinit();
+
         self::assertEquals(0, $response['category']['product_count']);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
      */
     public function testCategoryWithOutOfStockProductManageStockDisabled()
     {
-        $categoryId = 333;
+        $categoryId = 2;
+        $sku = 'simple-out-of-stock';
+        $manageStock = $this->scopeConfig->getValue(Configuration::XML_PATH_MANAGE_STOCK);
+
+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_MANAGE_STOCK, 0);
+        $this->reinitConfig->reinit();
+
+        // need to resave product to reindex it with new configuration.
+        $product = $this->productRepository->get($sku);
+        $this->productRepository->save($product);
 
         $query = <<<QUERY
 {
@@ -113,6 +168,9 @@ public function testCategoryWithOutOfStockProductManageStockDisabled()
 QUERY;
         $response = $this->graphQlQuery($query);
 
+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_MANAGE_STOCK, $manageStock);
+        $this->reinitConfig->reinit();
+
         self::assertEquals(1, $response['category']['product_count']);
     }
 
@@ -140,4 +198,84 @@ public function testCategoryWithDisabledProduct()
 
         self::assertEquals(0, $response['category']['product_count']);
     }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     */
+    public function testCategoryWithOutOfStockProductShowOutOfStockProduct()
+    {
+        $showOutOfStock = $this->scopeConfig->getValue(Configuration::XML_PATH_SHOW_OUT_OF_STOCK);
+
+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, 1);
+        $this->reinitConfig->reinit();
+
+        $categoryId = 2;
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, $showOutOfStock);
+        $this->reinitConfig->reinit();
+
+        self::assertEquals(1, $response['category']['product_count']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/CatalogRule/_files/configurable_product.php
+     */
+    public function testCategoryWithConfigurableChildrenOutOfStock()
+    {
+        $categoryId = 2;
+
+        $this->categoryLinkManagement->assignProductToCategories('configurable', [$categoryId]);
+
+        foreach (['simple1', 'simple2'] as $sku) {
+            $product = $this->productRepository->get($sku);
+            $product->setStockData(['is_in_stock' => 0]);
+            $this->productRepository->save($product);
+        }
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(0, $response['category']['product_count']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
+     */
+    public function testCategoryWithProductNotAvailableOnWebsite()
+    {
+        $product = $this->productRepository->getById(333);
+        $product->setWebsiteIds([]);
+        $this->productRepository->save($product);
+
+        $categoryId = 333;
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(0, $response['category']['product_count']);
+    }
 }