diff --git a/generator/generator_tests/feature_bucketer_test.cpp b/generator/generator_tests/feature_bucketer_test.cpp
new file mode 100644
index 0000000000..54c2959b6e
--- /dev/null
+++ b/generator/generator_tests/feature_bucketer_test.cpp
@@ -0,0 +1,79 @@
+#include "../../testing/testing.hpp"
+
+#include "../feature_bucketer.hpp"
+
+#include "../../indexer/feature.hpp"
+#include "../../indexer/mercator.hpp"
+#include "../../indexer/cell_id.hpp"
+#include "../../indexer/classificator_loader.hpp"
+
+#include "../../platform/platform.hpp"
+
+#include "../../indexer/indexer_tests/feature_routine.hpp"
+
+#include "../../base/stl_add.hpp"
+
+namespace
+{
+  class PushBackFeatureDebugStringOutput
+  {
+  public:
+    typedef map<string, vector<string> > * InitDataType;
+
+    PushBackFeatureDebugStringOutput(string const & name, InitDataType const & initData)
+      : m_pContainer(&((*initData)[name]))
+    {
+    }
+
+    void operator() (FeatureBuilder1 const & fb)
+    {
+      FeatureType f;
+      FeatureBuilder2Feature(
+        static_cast<FeatureBuilder2 &>(const_cast<FeatureBuilder1 &>(fb)), f);
+      m_pContainer->push_back(f.DebugString(0));
+    }
+
+  private:
+    vector<string> * m_pContainer;
+  };
+
+  typedef feature::CellFeatureBucketer<
+      PushBackFeatureDebugStringOutput,
+      feature::SimpleFeatureClipper,
+      MercatorBounds,
+      RectId
+  > FeatureBucketer;
+}
+
+UNIT_TEST(FeatureBucketerSmokeTest)
+{
+  Platform & pl = GetPlatform();
+
+  // classificator is needed because inside bucketer we're use it in WorldMapGenerator
+  // @TODO clean up or remove cell bucketer and replace with world countries bucketer
+  classificator::Read(pl.GetReader("drawing_rules.bin"),
+                      pl.GetReader("classificator.txt"),
+                      pl.GetReader("visibility.txt"),
+                      pl.GetReader("types.txt"));
+
+  map<string, vector<string> > out, expectedOut;
+  FeatureBucketer bucketer(1, &out);
+
+  uint32_t const defType = classificator::GetTestDefaultType();
+
+  FeatureBuilder2 fb;
+  fb.AddPoint(m2::PointD(10, 10));
+  fb.AddPoint(m2::PointD(20, 20));
+  fb.AddType(defType);
+  fb.SetLinear();
+  bucketer(fb);
+
+  FeatureType f;
+  FeatureBuilder2Feature(fb, f);
+  expectedOut["3"].push_back(f.DebugString(0));
+  TEST_EQUAL(out, expectedOut, ());
+
+  vector<string> bucketNames;
+  bucketer.GetBucketNames(MakeBackInsertFunctor(bucketNames));
+  TEST_EQUAL(bucketNames, vector<string>(1, "3"), ());
+}
diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp
index 8d1995b816..b7f89a80c4 100644
--- a/indexer/classificator_loader.cpp
+++ b/indexer/classificator_loader.cpp
@@ -44,4 +44,12 @@ namespace classificator
     file_t(new FileReader(fPath)).ReadAsString(buffer);
     classif().ReadVisibility(buffer);
   }
+
+  uint32_t GetTestDefaultType()
+  {
+    vector<string> v;
+    v.push_back("highway");
+    v.push_back("motorway");
+    return classif().GetTypeByPath(v);
+  }
 }
diff --git a/indexer/classificator_loader.hpp b/indexer/classificator_loader.hpp
index 989ecae8e7..45376a0f07 100644
--- a/indexer/classificator_loader.hpp
+++ b/indexer/classificator_loader.hpp
@@ -8,9 +8,13 @@
 namespace classificator
 {
   typedef ReaderPtr<Reader> file_t;
+
   void Read(file_t const & rules,
             file_t const & classificator,
             file_t const & visibility,
             file_t const & types);
   void ReadVisibility(string const & fPath);
+
+  /// This function used only in unit test to get any valid type value for feature testing.
+  uint32_t GetTestDefaultType();
 }