diff --git a/src/transformers/tokenization_auto.py b/src/transformers/tokenization_auto.py
index 683912add0d..8523331ed60 100644
--- a/src/transformers/tokenization_auto.py
+++ b/src/transformers/tokenization_auto.py
@@ -60,8 +60,8 @@ TOKENIZER_MAPPING = OrderedDict(
         (DistilBertConfig, DistilBertTokenizer),
         (AlbertConfig, AlbertTokenizer),
         (CamembertConfig, CamembertTokenizer),
-        (RobertaConfig, XLMRobertaTokenizer),
-        (XLMRobertaConfig, RobertaTokenizer),
+        (RobertaConfig, RobertaTokenizer),
+        (XLMRobertaConfig, XLMRobertaTokenizer),
         (BertConfig, BertTokenizer),
         (OpenAIGPTConfig, OpenAIGPTTokenizer),
         (GPT2Config, GPT2Tokenizer),