diff --git a/spec/ValueHandler/ProductOptionValueHandlerSpec.php b/spec/ValueHandler/ProductOptionValueHandlerSpec.php
index 0209d06f..64099f96 100644
--- a/spec/ValueHandler/ProductOptionValueHandlerSpec.php
+++ b/spec/ValueHandler/ProductOptionValueHandlerSpec.php
@@ -23,7 +23,6 @@
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Sylius\Component\Resource\Translation\Provider\TranslationLocaleProviderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Webgriffe\SyliusAkeneoPlugin\ApiClientInterface;
 use Webgriffe\SyliusAkeneoPlugin\ValueHandler\ProductOptionValueHandler;
 use Webgriffe\SyliusAkeneoPlugin\ValueHandlerInterface;
 
@@ -61,6 +60,7 @@ public function let(
     ): void {
         $productVariant->getCode()->willReturn(self::VARIANT_CODE);
         $productVariant->getProduct()->willReturn($product);
+        $productVariant->getOptionValues()->willReturn(new ArrayCollection());
         $product->getCode()->willReturn(self::PRODUCT_CODE);
         $product->getOptions()->willReturn(new ArrayCollection([$productOption->getWrappedObject()]));
         $productOption->getCode()->willReturn(self::OPTION_CODE);
diff --git a/src/ValueHandler/ProductOptionValueHandler.php b/src/ValueHandler/ProductOptionValueHandler.php
index f645bbd6..a45bd71d 100644
--- a/src/ValueHandler/ProductOptionValueHandler.php
+++ b/src/ValueHandler/ProductOptionValueHandler.php
@@ -99,6 +99,8 @@ public function handle($productVariant, string $optionCode, array $akeneoValue):
         /** @var string|array|bool|int $akeneoValueData */
         $akeneoValueData = $akeneoValue[0]['data'];
 
+        $productVariant->getOptionValues()->clear();
+
         $productOption = $this->getProductOption($optionCode, $productVariant, $product);
 
         /** @var string $attributeType */
diff --git a/tests/InMemory/Client/Api/InMemoryApi.php b/tests/InMemory/Client/Api/InMemoryApi.php
new file mode 100644
index 00000000..01bd2357
--- /dev/null
+++ b/tests/InMemory/Client/Api/InMemoryApi.php
@@ -0,0 +1,146 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api;
+
+use Akeneo\Pim\ApiClient\Api\Operation\CreatableResourceInterface;
+use Akeneo\Pim\ApiClient\Api\Operation\DeletableResourceInterface;
+use Akeneo\Pim\ApiClient\Api\Operation\GettableResourceInterface;
+use Akeneo\Pim\ApiClient\Api\Operation\ListableResourceInterface;
+use Akeneo\Pim\ApiClient\Api\Operation\UpsertableResourceInterface;
+use Akeneo\Pim\ApiClient\Api\Operation\UpsertableResourceListInterface;
+use Akeneo\Pim\ApiClient\Exception\NotFoundHttpException;
+use Akeneo\Pim\ApiClient\Pagination\PageInterface;
+use Akeneo\Pim\ApiClient\Pagination\ResourceCursorInterface;
+use ArrayIterator;
+use GuzzleHttp\Promise\PromiseInterface;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Response;
+use Http\Promise\Promise;
+use Psr\Http\Message\StreamInterface;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model\ResourceInterface;
+use Webmozart\Assert\Assert;
+
+/**
+ * @template T of ResourceInterface
+ */
+abstract class InMemoryApi implements
+    ListableResourceInterface,
+    GettableResourceInterface,
+    CreatableResourceInterface,
+    UpsertableResourceInterface,
+    UpsertableResourceListInterface,
+    DeletableResourceInterface
+{
+    /**
+     * @var array<string, T>
+     */
+    public static array $resources = [];
+
+    /** @return class-string */
+    abstract protected function getResourceClass(): string;
+
+    public static function addResource(ResourceInterface $resource)
+    {
+        self::$resources[$resource->getIdentifier()] = $resource;
+    }
+
+    public function create(string $code, array $data = []): int
+    {
+        $class = $this->getResourceClass();
+        Assert::isInstanceOf($class, ResourceInterface::class);
+
+        self::$resources[] = call_user_func([$class, 'create'], [$code, $data]);
+
+        return 201;
+    }
+
+    public function delete(string $code): int
+    {
+        if (!array_key_exists($code, self::$resources)) {
+            throw $this->createNotFoundException();
+        }
+        unset(self::$resources[$code]);
+
+        return 204;
+    }
+
+    public function listPerPage(int $limit = 100, bool $withCount = false, array $queryParameters = []): PageInterface
+    {
+        // TODO: Implement listPerPage() method.
+    }
+
+    public function all(int $pageSize = 100, array $queryParameters = []): ResourceCursorInterface
+    {
+        return new class(new ArrayIterator(self::$resources), $pageSize) implements ResourceCursorInterface {
+            public function __construct(private ArrayIterator $iterator, private int $pageSize)
+            {
+            }
+
+            public function current()
+            {
+                return $this->iterator->current();
+            }
+
+            public function next(): void
+            {
+                $this->iterator->next();
+            }
+
+            public function key(): mixed
+            {
+                return $this->iterator->key();
+            }
+
+            public function valid(): bool
+            {
+                return $this->iterator->valid();
+            }
+
+            public function rewind(): void
+            {
+                $this->iterator->rewind();
+            }
+
+            public function getPageSize(): ?int
+            {
+                return $this->pageSize;
+            }
+        };
+    }
+
+    public function get(string $code, array $queryParameters = []): array
+    {
+        if (!array_key_exists($code, self::$resources)) {
+            throw $this->createNotFoundException();
+        }
+
+        return (array) self::$resources[$code];
+    }
+
+    public function upsert(string $code, array $data = []): int
+    {
+        // TODO: Implement upsert() method.
+    }
+
+    public function upsertAsync(string $code, array $data = []): PromiseInterface|Promise
+    {
+        // TODO: Implement upsertAsync() method.
+    }
+
+    public function upsertList(StreamInterface|array $resources): \Traversable
+    {
+        // TODO: Implement upsertList() method.
+    }
+
+    public function upsertAsyncList(StreamInterface|array $resources): PromiseInterface|Promise
+    {
+        // TODO: Implement upsertAsyncList() method.
+    }
+
+    private function createNotFoundException(): NotFoundHttpException
+    {
+        return new NotFoundHttpException('Resource not found', new Request('GET', '/'), new Response(404));
+    }
+}
diff --git a/tests/InMemory/Client/Api/InMemoryAttributeApi.php b/tests/InMemory/Client/Api/InMemoryAttributeApi.php
new file mode 100644
index 00000000..92e93b7a
--- /dev/null
+++ b/tests/InMemory/Client/Api/InMemoryAttributeApi.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api;
+
+use Akeneo\Pim\ApiClient\Api\AttributeApiInterface;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model\Attribute;
+
+final class InMemoryAttributeApi extends InMemoryApi implements AttributeApiInterface
+{
+    protected function getResourceClass(): string
+    {
+        return Attribute::class;
+    }
+}
diff --git a/tests/InMemory/Client/Api/InMemoryAttributeOptionApi.php b/tests/InMemory/Client/Api/InMemoryAttributeOptionApi.php
new file mode 100644
index 00000000..bb915017
--- /dev/null
+++ b/tests/InMemory/Client/Api/InMemoryAttributeOptionApi.php
@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api;
+
+use Akeneo\Pim\ApiClient\Api\AttributeOptionApiInterface;
+use Akeneo\Pim\ApiClient\Exception\NotFoundHttpException;
+use Akeneo\Pim\ApiClient\Pagination\PageInterface;
+use Akeneo\Pim\ApiClient\Pagination\ResourceCursorInterface;
+use GuzzleHttp\Promise\PromiseInterface;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Response;
+use Http\Promise\Promise;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model\AttributeOption;
+
+final class InMemoryAttributeOptionApi implements AttributeOptionApiInterface
+{
+    /**
+     * @var array<string, <string, AttributeOption>>
+     */
+    public static array $attributeOptions = [];
+
+    public static function addResource(AttributeOption $attributeOption): void
+    {
+        self::$attributeOptions[$attributeOption->attribute][$attributeOption->code] = $attributeOption;
+    }
+
+    public function get($attributeCode, $code): array
+    {
+        if (!array_key_exists($attributeCode, self::$attributeOptions)) {
+            throw $this->createNotFoundException();
+        }
+        $attributeOptions = self::$attributeOptions[$attributeCode];
+        if (!array_key_exists($code, $attributeOptions)) {
+            throw $this->createNotFoundException();
+        }
+
+        return (array) $attributeOptions[$code];
+    }
+
+    public function create($attributeCode, $attributeOptionCode, array $data = []): int
+    {
+        self::$attributeOptions[] = AttributeOption::create($attributeCode, $attributeOptionCode, $data);
+
+        return 201;
+    }
+
+    public function listPerPage($attributeCode, $limit = 100, $withCount = false, array $queryParameters = []): PageInterface
+    {
+        // TODO: Implement listPerPage() method.
+    }
+
+    public function all($attributeCode, $pageSize = 10, array $queryParameters = []): ResourceCursorInterface
+    {
+        // TODO: Implement all() method.
+    }
+
+    public function upsert($attributeCode, $attributeOptionCode, array $data = []): int
+    {
+        // TODO: Implement upsert() method.
+    }
+
+    public function upsertAsync($attributeCode, $attributeOptionCode, array $data = []): PromiseInterface|Promise
+    {
+        // TODO: Implement upsertAsync() method.
+    }
+
+    public function upsertList($attributeCode, $attributeOptions): \Traversable
+    {
+        // TODO: Implement upsertList() method.
+    }
+
+    public function upsertAsyncList($attributeCode, $attributeOptions): PromiseInterface|Promise
+    {
+        // TODO: Implement upsertAsyncList() method.
+    }
+
+    private function createNotFoundException(): NotFoundHttpException
+    {
+        return new NotFoundHttpException('Attribute option not found', new Request('GET', '/'), new Response(404));
+    }
+}
diff --git a/tests/InMemory/Client/Api/InMemoryProductApi.php b/tests/InMemory/Client/Api/InMemoryProductApi.php
new file mode 100644
index 00000000..0d74ba35
--- /dev/null
+++ b/tests/InMemory/Client/Api/InMemoryProductApi.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api;
+
+use Akeneo\Pim\ApiClient\Api\ProductApiInterface;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model\Product;
+
+final class InMemoryProductApi extends InMemoryApi implements ProductApiInterface
+{
+
+    protected function getResourceClass(): string
+    {
+        return Product::class;
+    }
+}
diff --git a/tests/InMemory/Client/Api/Model/Attribute.php b/tests/InMemory/Client/Api/Model/Attribute.php
new file mode 100644
index 00000000..c4d93a6c
--- /dev/null
+++ b/tests/InMemory/Client/Api/Model/Attribute.php
@@ -0,0 +1,121 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model;
+
+use DateTimeInterface;
+
+final class Attribute implements ResourceInterface
+{
+    public function __construct(
+        public string $code,
+        public string $type = AttributeType::TEXT,
+        public ?string $group = null,
+        public bool $unique = false,
+        public bool $useableAsGridFilter = true,
+        public array $allowedExtension = [],
+        public ?string $metricFamily = null,
+        public ?string $defaultMetricUnit = null,
+        public ?string $referenceDataName = null,
+        public array $availableLocales = [],
+        public ?int $maxCharacters = null,
+        public ?string $validationRule = null,
+        public ?string $validationRegexp = null,
+        public ?bool $wysiwygEnabled = null,
+        public ?int $numberMin = null,
+        public ?int $numberMax = null,
+        public ?bool $decimalsAllowed = null,
+        public ?bool $negativeAllowed = null,
+        public ?DateTimeInterface $dateMin = null,
+        public ?DateTimeInterface $dateMax = null,
+        public ?int $maxFileSize = null,
+        public ?int $minimumInputLength = null,
+        public int $sortOrder = 0,
+        public bool $localizable = false,
+        public bool $scopable = false,
+        public array $labels = [],
+        public array $guidelines = [],
+        public ?bool $autoOptionSorting = null,
+        public mixed $defaultValue = null,
+        public array $groupLabels = [],
+    ) {
+    }
+
+    public static function create(string $code, array $data = []): ResourceInterface
+    {
+        return new self(
+            $code,
+            $data['type'] ?? AttributeType::TEXT,
+            $data['group'] ?? null,
+            $data['unique'] ?? false,
+            $data['useable_as_grid_filter'] ?? true,
+            $data['allowed_extensions'] ?? [],
+            $data['metric_family'] ?? null,
+            $data['default_metric_unit'] ?? null,
+            $data['reference_data_name'] ?? null,
+            $data['available_locales'] ?? [],
+            $data['max_characters'] ?? null,
+            $data['validation_rule'] ?? null,
+            $data['validation_regexp'] ?? null,
+            $data['wysiwyg_enabled'] ?? null,
+            $data['number_min'] ?? null,
+            $data['number_max'] ?? null,
+            $data['decimals_allowed'] ?? null,
+            $data['negative_allowed'] ?? null,
+            $data['date_min'] ?? null,
+            $data['date_max'] ?? null,
+            $data['max_file_size'] ?? null,
+            $data['minimum_input_length'] ?? null,
+            $data['sort_order'] ?? 0,
+            $data['localizable'] ?? false,
+            $data['scopable'] ?? false,
+            $data['labels'] ?? [],
+            $data['guidelines'] ?? [],
+            $data['auto_option_sorting'] ?? null,
+            $data['default_value'] ?? null,
+            $data['group_labels'] ?? [],
+        );
+    }
+
+    public function __serialize(): array
+    {
+        return [
+            'code' => $this->code,
+            'type' => $this->type,
+            'group' => $this->group,
+            'unique' => $this->unique,
+            'useable_as_grid_filter' => $this->useableAsGridFilter,
+            'allowed_extensions' => $this->allowedExtension,
+            'metric_family' => $this->metricFamily,
+            'default_metric_unit' => $this->defaultMetricUnit,
+            'reference_data_name' => $this->referenceDataName,
+            'available_locales' => $this->availableLocales,
+            'max_characters' => $this->maxCharacters,
+            'validation_rule' => $this->validationRule,
+            'validation_regexp' => $this->validationRegexp,
+            'wysiwyg_enabled' => $this->wysiwygEnabled,
+            'number_min' => $this->numberMin,
+            'number_max' => $this->numberMax,
+            'decimals_allowed' => $this->decimalsAllowed,
+            'negative_allowed' => $this->negativeAllowed,
+            'date_min' => $this->dateMin,
+            'date_max' => $this->dateMax,
+            'max_file_size' => $this->maxFileSize,
+            'minimum_input_length' => $this->minimumInputLength,
+            'sort_order' => $this->sortOrder,
+            'localizable' => $this->localizable,
+            'scopable' => $this->scopable,
+            'labels' => $this->labels,
+            'guidelines' => $this->guidelines,
+            'auto_option_sorting' => $this->autoOptionSorting,
+            'default_value' => $this->defaultValue,
+            'group_labels' => $this->groupLabels,
+        ];
+    }
+
+    public function getIdentifier(): string
+    {
+        return $this->code;
+    }
+}
diff --git a/tests/InMemory/Client/Api/Model/AttributeOption.php b/tests/InMemory/Client/Api/Model/AttributeOption.php
new file mode 100644
index 00000000..0302ebd9
--- /dev/null
+++ b/tests/InMemory/Client/Api/Model/AttributeOption.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model;
+
+use Webmozart\Assert\Assert;
+
+final class AttributeOption
+{
+    public function __construct(
+        public string $code,
+        public string $attribute,
+        public int $sortOrder,
+        public array $labels,
+    ) {
+    }
+
+    public static function create(string $attribute, string $code, int $sortOrder = 0, array $labels = []): self
+    {
+        return new self(
+            $code,
+            $attribute,
+            $sortOrder,
+            $labels,
+        );
+    }
+
+    public function __serialize(): array
+    {
+        return [
+            'code' => $this->code,
+            'attribute' => $this->attribute,
+            'sort_order' => $this->sortOrder,
+            'labels' => $this->labels,
+        ];
+    }
+
+    public function getIdentifier(): string
+    {
+        return $this->code;
+    }
+}
diff --git a/tests/InMemory/Client/Api/Model/AttributeType.php b/tests/InMemory/Client/Api/Model/AttributeType.php
new file mode 100644
index 00000000..2065553c
--- /dev/null
+++ b/tests/InMemory/Client/Api/Model/AttributeType.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model;
+
+final class AttributeType
+{
+    public const TEXT = 'pim_catalog_text';
+    public const SIMPLE_SELECT = 'pim_catalog_simpleselect';
+}
diff --git a/tests/InMemory/Client/Api/Model/Product.php b/tests/InMemory/Client/Api/Model/Product.php
new file mode 100644
index 00000000..f0b3595e
--- /dev/null
+++ b/tests/InMemory/Client/Api/Model/Product.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model;
+
+use DateTimeImmutable;
+use DateTimeInterface;
+
+final class Product implements ResourceInterface
+{
+    public DateTimeInterface $created;
+    public DateTimeInterface $updated;
+
+    /**
+     * @param string[] $categories
+     * @param string[] $groups
+     * @param array<string, array{'locale': ?string, 'scope': ?string, 'data': mixed}> $values
+     * @param array<string, array{'products': string[], 'product_models': string[], 'groups': string[]}> $associations
+     * @param array $quantifiedAssociations
+     */
+    private function __construct(
+        public string $identifier,
+        public bool $enabled = true,
+        public ?string $family = null,
+        public array $categories = [],
+        public array $groups = [],
+        public ?string $parent = null,
+        public array $values = [],
+        public array $associations = [],
+        public array $quantifiedAssociations = [],
+    ) {
+        $now = new DateTimeImmutable();
+        $this->created = $now;
+        $this->updated = $now;
+    }
+
+    public static function create(string $code, array $data = []): self
+    {
+        return new self(
+            $code,
+            $data['enabled'] ?? true,
+            $data['family'] ?? null,
+            $data['categories'] ?? [],
+            $data['groups'] ?? [],
+            $data['parent'] ?? null,
+            $data['values'] ?? [],
+            $data['associations'] ?? [],
+            $data['quantifiedAssociations'] ?? [],
+        );
+    }
+
+    public function getIdentifier(): string
+    {
+        return $this->identifier;
+    }
+
+    public function __serialize(): array
+    {
+        return [
+            'identifier' => $this->identifier,
+            'enabled' => $this->enabled,
+            'family' => $this->family,
+            'categories' => $this->categories,
+            'groups' => $this->groups,
+            'parent' => $this->parent,
+            'values' => $this->values,
+            'created' => $this->created->format('c'),
+            'updated' => $this->updated->format('c'),
+            'associations' => $this->associations,
+            'quantified_associations' => $this->quantifiedAssociations,
+        ];
+    }
+
+    public function __unserialize(array $data): void
+    {
+        $this->identifier = $data['identifier'];
+        $this->enabled = $data['enabled'];
+        $this->family = $data['family'];
+        $this->categories = $data['categories'];
+        $this->groups = $data['groups'];
+        $this->parent = $data['parent'];
+        $this->values = $data['values'];
+        $this->created = $data['created'];
+        $this->updated = $data['updated'];
+        $this->associations = $data['associations'];
+        $this->quantifiedAssociations = $data['quantified_associations'];
+    }
+}
diff --git a/tests/InMemory/Client/Api/Model/ResourceInterface.php b/tests/InMemory/Client/Api/Model/ResourceInterface.php
new file mode 100644
index 00000000..8a7477fe
--- /dev/null
+++ b/tests/InMemory/Client/Api/Model/ResourceInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model;
+
+interface ResourceInterface
+{
+    public static function create(string $code, array $data = []): self;
+
+    public function __serialize(): array;
+
+    public function getIdentifier(): string;
+}
diff --git a/tests/InMemory/Client/InMemoryAkeneoPimClient.php b/tests/InMemory/Client/InMemoryAkeneoPimClient.php
new file mode 100644
index 00000000..c7a6146b
--- /dev/null
+++ b/tests/InMemory/Client/InMemoryAkeneoPimClient.php
@@ -0,0 +1,214 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client;
+
+use Akeneo\Pim\ApiClient\AkeneoPimClientInterface;
+use Akeneo\Pim\ApiClient\Api\AppCatalog\AppCatalogApiInterface;
+use Akeneo\Pim\ApiClient\Api\AppCatalog\AppCatalogProductApiInterface;
+use Akeneo\Pim\ApiClient\Api\AssetApiInterface;
+use Akeneo\Pim\ApiClient\Api\AssetCategoryApiInterface;
+use Akeneo\Pim\ApiClient\Api\AssetManager\AssetApiInterface as AssetManagerApiInterface;
+use Akeneo\Pim\ApiClient\Api\AssetManager\AssetAttributeApiInterface;
+use Akeneo\Pim\ApiClient\Api\AssetManager\AssetAttributeOptionApiInterface;
+use Akeneo\Pim\ApiClient\Api\AssetManager\AssetFamilyApiInterface;
+use Akeneo\Pim\ApiClient\Api\AssetManager\AssetMediaFileApiInterface;
+use Akeneo\Pim\ApiClient\Api\AssetReferenceFileApiInterface;
+use Akeneo\Pim\ApiClient\Api\AssetTagApiInterface;
+use Akeneo\Pim\ApiClient\Api\AssetVariationFileApiInterface;
+use Akeneo\Pim\ApiClient\Api\AssociationTypeApiInterface;
+use Akeneo\Pim\ApiClient\Api\AttributeApiInterface;
+use Akeneo\Pim\ApiClient\Api\AttributeGroupApiInterface;
+use Akeneo\Pim\ApiClient\Api\AttributeOptionApiInterface;
+use Akeneo\Pim\ApiClient\Api\CategoryApiInterface;
+use Akeneo\Pim\ApiClient\Api\ChannelApiInterface;
+use Akeneo\Pim\ApiClient\Api\CurrencyApiInterface;
+use Akeneo\Pim\ApiClient\Api\FamilyApiInterface;
+use Akeneo\Pim\ApiClient\Api\FamilyVariantApiInterface;
+use Akeneo\Pim\ApiClient\Api\LocaleApiInterface;
+use Akeneo\Pim\ApiClient\Api\MeasureFamilyApiInterface;
+use Akeneo\Pim\ApiClient\Api\MeasurementFamilyApiInterface;
+use Akeneo\Pim\ApiClient\Api\MediaFileApiInterface;
+use Akeneo\Pim\ApiClient\Api\Operation\DownloadableResourceInterface;
+use Akeneo\Pim\ApiClient\Api\ProductApiInterface;
+use Akeneo\Pim\ApiClient\Api\ProductDraftApiInterface;
+use Akeneo\Pim\ApiClient\Api\ProductDraftUuidApiInterface;
+use Akeneo\Pim\ApiClient\Api\ProductModelApiInterface;
+use Akeneo\Pim\ApiClient\Api\ProductModelDraftApiInterface;
+use Akeneo\Pim\ApiClient\Api\ProductUuidApiInterface;
+use Akeneo\Pim\ApiClient\Api\PublishedProductApiInterface;
+use Akeneo\Pim\ApiClient\Api\ReferenceEntityApiInterface;
+use Akeneo\Pim\ApiClient\Api\ReferenceEntityAttributeApiInterface;
+use Akeneo\Pim\ApiClient\Api\ReferenceEntityAttributeOptionApiInterface;
+use Akeneo\Pim\ApiClient\Api\ReferenceEntityMediaFileApiInterface;
+use Akeneo\Pim\ApiClient\Api\ReferenceEntityRecordApiInterface;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\InMemoryAttributeApi;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\InMemoryAttributeOptionApi;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\InMemoryProductApi;
+
+final class InMemoryAkeneoPimClient implements AkeneoPimClientInterface
+{
+    public function getToken(): ?string
+    {
+    }
+
+    public function getRefreshToken(): ?string
+    {
+    }
+
+    public function getProductApi(): ProductApiInterface
+    {
+        return new InMemoryProductApi();
+    }
+
+    public function getCategoryApi(): CategoryApiInterface
+    {
+    }
+
+    public function getCategoryMediaFileApi(): DownloadableResourceInterface
+    {
+    }
+
+    public function getAttributeApi(): AttributeApiInterface
+    {
+        return new InMemoryAttributeApi();
+    }
+
+    public function getAttributeOptionApi(): AttributeOptionApiInterface
+    {
+        return new InMemoryAttributeOptionApi();
+    }
+
+    public function getAttributeGroupApi(): AttributeGroupApiInterface
+    {
+    }
+
+    public function getFamilyApi(): FamilyApiInterface
+    {
+    }
+
+    public function getProductMediaFileApi(): MediaFileApiInterface
+    {
+    }
+
+    public function getLocaleApi(): LocaleApiInterface
+    {
+    }
+
+    public function getChannelApi(): ChannelApiInterface
+    {
+    }
+
+    public function getCurrencyApi(): CurrencyApiInterface
+    {
+    }
+
+    public function getMeasureFamilyApi(): MeasureFamilyApiInterface
+    {
+    }
+
+    public function getMeasurementFamilyApi(): MeasurementFamilyApiInterface
+    {
+    }
+
+    public function getAssociationTypeApi(): AssociationTypeApiInterface
+    {
+    }
+
+    public function getFamilyVariantApi(): FamilyVariantApiInterface
+    {
+    }
+
+    public function getProductModelApi(): ProductModelApiInterface
+    {
+    }
+
+    public function getPublishedProductApi(): PublishedProductApiInterface
+    {
+    }
+
+    public function getProductModelDraftApi(): ProductModelDraftApiInterface
+    {
+    }
+
+    public function getProductDraftApi(): ProductDraftApiInterface
+    {
+    }
+
+    public function getAssetApi(): AssetApiInterface
+    {
+    }
+
+    public function getAssetCategoryApi(): AssetCategoryApiInterface
+    {
+    }
+
+    public function getAssetTagApi(): AssetTagApiInterface
+    {
+    }
+
+    public function getAssetReferenceFileApi(): AssetReferenceFileApiInterface
+    {
+    }
+
+    public function getAssetVariationFileApi(): AssetVariationFileApiInterface
+    {
+    }
+
+    public function getReferenceEntityRecordApi(): ReferenceEntityRecordApiInterface
+    {
+    }
+
+    public function getReferenceEntityMediaFileApi(): ReferenceEntityMediaFileApiInterface
+    {
+    }
+
+    public function getReferenceEntityAttributeApi(): ReferenceEntityAttributeApiInterface
+    {
+    }
+
+    public function getReferenceEntityAttributeOptionApi(): ReferenceEntityAttributeOptionApiInterface
+    {
+    }
+
+    public function getReferenceEntityApi(): ReferenceEntityApiInterface
+    {
+    }
+
+    public function getAssetManagerApi(): AssetManagerApiInterface
+    {
+    }
+
+    public function getAssetFamilyApi(): AssetFamilyApiInterface
+    {
+    }
+
+    public function getAssetAttributeApi(): AssetAttributeApiInterface
+    {
+    }
+
+    public function getAssetAttributeOptionApi(): AssetAttributeOptionApiInterface
+    {
+    }
+
+    public function getAssetMediaFileApi(): AssetMediaFileApiInterface
+    {
+    }
+
+    public function getProductUuidApi(): ProductUuidApiInterface
+    {
+    }
+
+    public function getProductDraftUuidApi(): ProductDraftUuidApiInterface
+    {
+    }
+
+    public function getAppCatalogApi(): AppCatalogApiInterface
+    {
+    }
+
+    public function getAppCatalogProductApi(): AppCatalogProductApiInterface
+    {
+    }
+}
diff --git a/tests/Integration/DataFixtures/DataFixture.php b/tests/Integration/DataFixtures/DataFixture.php
new file mode 100644
index 00000000..bb64d550
--- /dev/null
+++ b/tests/Integration/DataFixtures/DataFixture.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Webgriffe\SyliusAkeneoPlugin\Integration\DataFixtures;
+
+final class DataFixture
+{
+    public const path = __DIR__;
+}
diff --git a/tests/Integration/DataFixtures/ORM/resources/Product/box.yaml b/tests/Integration/DataFixtures/ORM/resources/Product/box.yaml
new file mode 100644
index 00000000..1b2c0f93
--- /dev/null
+++ b/tests/Integration/DataFixtures/ORM/resources/Product/box.yaml
@@ -0,0 +1,40 @@
+Sylius\Component\Product\Model\ProductOption:
+    format:
+        code: "format"
+        translations:
+            - "@format_en_US"
+
+Sylius\Component\Product\Model\ProductOptionTranslation:
+    format_en_US:
+        locale: "en_US"
+        name: "Format"
+
+Sylius\Component\Product\Model\ProductOptionValue:
+    format-133x32:
+        code: "133x32"
+        option: "@format"
+
+Sylius\Component\Core\Model\Product:
+    box-product:
+        fallbackLocale: "en_US"
+        currentLocale: "en_US"
+        code: "BOX"
+        translations:
+            - "@box-product_en_US"
+        options:
+            - "@format"
+        variantSelectionMethod: 'choice'
+
+Sylius\Component\Core\Model\ProductTranslation:
+    box-product_en_US:
+        locale: "en_US"
+        name: "Box"
+        slug: "box"
+        description: <paragraph(2)>
+
+Sylius\Component\Core\Model\ProductVariant:
+    box-variant:
+        code: "BOX_VARIANT"
+        product: "@box-product"
+        optionValues:
+            - "@format-133x32"
diff --git a/tests/Integration/Product/ImporterTest.php b/tests/Integration/Product/ImporterTest.php
index 338743ba..a8baf0a8 100644
--- a/tests/Integration/Product/ImporterTest.php
+++ b/tests/Integration/Product/ImporterTest.php
@@ -13,9 +13,22 @@
 use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
+use Sylius\Component\Product\Model\ProductOptionValueInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Filesystem\Filesystem;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\InMemoryAttributeApi;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\InMemoryAttributeOptionApi;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\InMemoryProductApi;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model\Attribute;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model\AttributeOption;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model\AttributeType;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\Api\Model\Product;
+use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\InMemoryAkeneoPimClient;
+use Tests\Webgriffe\SyliusAkeneoPlugin\Integration\DataFixtures\DataFixture;
 use Webgriffe\SyliusAkeneoPlugin\ImporterInterface;
+use Webgriffe\SyliusAkeneoPlugin\PriorityValueHandlersResolver;
+use Webgriffe\SyliusAkeneoPlugin\Product\Importer;
+use Webgriffe\SyliusAkeneoPlugin\ValueHandler\ProductOptionValueHandler;
 
 final class ImporterTest extends KernelTestCase
 {
@@ -796,4 +809,87 @@ public function it_enables_product_without_variants_while_importing_a_new_one():
         self::assertTrue($product->isEnabled());
         self::assertTrue($productVariant->isEnabled());
     }
+
+    /**
+     * @test
+     *
+     * @TODO This tests adds also the new in memory implementation of Akeneo API client.
+     * To use that only on this specific test we have overriden the importer definition.
+     * Obviously, when the new implementation will be the default one, all this rewrite should be removed!
+     */
+    public function it_does_not_duplicate_product_option_values_when_changed(): void
+    {
+        $this->fixtureLoader->load(
+            [
+                DataFixture::path . '/ORM/resources/Locale/en_US.yaml',
+                DataFixture::path . '/ORM/resources/Product/box.yaml',
+            ],
+            [],
+            [],
+            PurgeMode::createDeleteMode(),
+        );
+        $akeneoPimClient = new InMemoryAkeneoPimClient();
+        $productOptionValueHandler = new ProductOptionValueHandler(
+            $akeneoPimClient,
+            self::getContainer()->get('sylius.repository.product_option'),
+            self::getContainer()->get('sylius.factory.product_option_value'),
+            self::getContainer()->get('sylius.factory.product_option_value_translation'),
+            self::getContainer()->get('sylius.repository.product_option_value'),
+            self::getContainer()->get('sylius.translation_locale_provider'),
+            self::getContainer()->get('translator'),
+        );
+        $valueHandlersResolver = new PriorityValueHandlersResolver();
+        $valueHandlersResolver->add($productOptionValueHandler);
+        $this->importer = new Importer(
+            self::getContainer()->get('sylius.factory.product_variant'),
+            self::getContainer()->get('sylius.repository.product_variant'),
+            self::getContainer()->get('sylius.repository.product'),
+            $akeneoPimClient,
+            $valueHandlersResolver,
+            self::getContainer()->get('sylius.factory.product'),
+            self::getContainer()->get('webgriffe_sylius_akeneo.product.taxons_resolver'),
+            self::getContainer()->get('webgriffe_sylius_akeneo.product.product_options_resolver'),
+            self::getContainer()->get('event_dispatcher'),
+            self::getContainer()->get('webgriffe_sylius_akeneo.product.channels_resolver'),
+            self::getContainer()->get('webgriffe_sylius_akeneo.product.status_resolver'),
+            self::getContainer()->get('sylius.factory.product_taxon'),
+            self::getContainer()->get('webgriffe_sylius_akeneo.product.variant_status_resolver'),
+            self::getContainer()->get('webgriffe_sylius_akeneo.product.validator'),
+        );
+        $akeneoProduct = Product::create('BOX_VARIANT', [
+            'values' => ['format' => [[
+                'locale' => null,
+                'scope' => null,
+                'data' => '133x48',
+            ]]],
+            'parent' => 'BOX',
+        ]);
+        InMemoryProductApi::addResource($akeneoProduct);
+        $akeneoFormatAttribute = Attribute::create('format', [
+            'type' => AttributeType::SIMPLE_SELECT,
+        ]);
+        InMemoryAttributeApi::addResource($akeneoFormatAttribute);
+        $akeneoFormatAttributeOption = AttributeOption::create(
+            $akeneoFormatAttribute->getIdentifier(),
+            '133x48',
+            1,
+            ['en_US' => 'Format 133x48'],
+        );
+        InMemoryAttributeOptionApi::addResource($akeneoFormatAttributeOption);
+
+        $this->importer->import('BOX_VARIANT');
+
+        /** @var ProductVariantInterface[] $allVariants */
+        $allVariants = $this->productVariantRepository->findAll();
+        $this->assertCount(1, $allVariants);
+        $variant = reset($allVariants);
+        $this->assertInstanceOf(ProductVariantInterface::class, $variant);
+        $this->assertInstanceOf(ProductInterface::class, $variant->getProduct());
+        $this->assertEquals('BOX', $variant->getProduct()->getCode());
+        $this->assertCount(1, $variant->getOptionValues());
+        $optionValue = $variant->getOptionValues()->first();
+        $this->assertInstanceOf(ProductOptionValueInterface::class, $optionValue);
+        $this->assertEquals('format', $optionValue->getOptionCode());
+        $this->assertEquals('Format 133x48', $optionValue->getValue());
+    }
 }